diff options
290 files changed, 924 insertions, 924 deletions
diff --git a/akregator/HACKING b/akregator/HACKING index 4567e4d49..7ff481182 100644 --- a/akregator/HACKING +++ b/akregator/HACKING @@ -66,7 +66,7 @@ Spaces ================================================================================ Spaces should be used between the conditional / loop type and the -conditional statement. They should not be used after tqparenthesis. However +conditional statement. They should not be used after parenthesis. However the should be to mark of mathematical or comparative operators. if ( foo == bar ) diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui index 9874d08bd..7d9a8a482 100644 --- a/akregator/src/addfeedwidgetbase.ui +++ b/akregator/src/addfeedwidgetbase.ui @@ -137,7 +137,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>ksqueezedtextlabel.h</includehint> diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index a5189749f..1cfd42b11 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -116,7 +116,7 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor } }; -Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/, +Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, TQObject *tqparent, const char *name, const TQStringList& ) : DCOPObject("AkregatorIface") , MyBasePart(tqparent, name) @@ -168,7 +168,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/, { m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams); - KMessageBox::error(tqparentWidget, 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.").tqarg(Settings::archiveBackend()), i18n("Plugin error") ); } Filters::ArticleFilterList list; @@ -187,7 +187,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/, m_actionManager = new ActionManagerImpl(this); ActionManager::setInstance(m_actionManager); - m_view = new Akregator::View(this, tqparentWidget, m_actionManager, "akregator_view"); + m_view = new Akregator::View(this, parentWidget, m_actionManager, "akregator_view"); m_actionManager->initView(m_view); m_actionManager->setTagSet(Kernel::self()->tagSet()); @@ -823,7 +823,7 @@ KParts::Part* Part::hitTest(TQWidget *widget, const TQPoint &globalPos) if (!widget) { break; } - widget = widget->tqparentWidget(); + widget = widget->parentWidget(); } if (m_view && m_view->currentFrame() && child) { return m_view->currentFrame()->part(); diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index 43404a179..c60316cca 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -82,7 +82,7 @@ namespace Akregator typedef MyBasePart inherited; /** Default constructor.*/ - Part(TQWidget *tqparentWidget, const char *widgetName, + Part(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList&); /** Destructor. */ diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index ac9c82125..a891445fc 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -212,15 +212,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor TagNodeItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); - if (tqparentItem) + FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + if (parentItem) { if (prev) { - item = new TagNodeItem( tqparentItem, m_view->findNodeItem(prev), node); + item = new TagNodeItem( parentItem, m_view->findNodeItem(prev), node); } else - item = new TagNodeItem( tqparentItem, node); + item = new TagNodeItem( parentItem, node); } else { @@ -234,8 +234,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor item->nodeChanged(); m_view->d->itemDict.insert(node, item); m_view->connectToNode(node); - if (tqparentItem) - tqparentItem->sortChildItems(0, true); + if (parentItem) + parentItem->sortChildItems(0, true); return true; } @@ -246,15 +246,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor TagFolderItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); - if (tqparentItem) + FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + if (parentItem) { if (prev) { - item = new TagFolderItem( tqparentItem, m_view->findNodeItem(prev), node); + item = new TagFolderItem( parentItem, m_view->findNodeItem(prev), node); } else - item = new TagFolderItem(tqparentItem, node); + item = new TagFolderItem(parentItem, node); } else { @@ -284,15 +284,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor FolderItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); - if (tqparentItem) + FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + if (parentItem) { if (prev) { - item = new FolderItem( tqparentItem, m_view->findNodeItem(prev), node); + item = new FolderItem( parentItem, m_view->findNodeItem(prev), node); } else - item = new FolderItem(tqparentItem, node); + item = new FolderItem(parentItem, node); } else { @@ -321,16 +321,16 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor FeedItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); - if (tqparentItem) + if (parentItem) { if (prev) { - item = new FeedItem( tqparentItem, m_view->findNodeItem(prev), node); + item = new FeedItem( parentItem, m_view->findNodeItem(prev), node); } else - item = new FeedItem( tqparentItem, node); + item = new FeedItem( parentItem, node); } else { @@ -534,7 +534,7 @@ void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem { openFolder(); - Folder* tqparentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node(); + Folder* parentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node(); TreeNode* afterMeNode = 0; TreeNode* current = selectedNode(); @@ -542,7 +542,7 @@ void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem afterMeNode = (dynamic_cast<TreeNodeItem*> (d->afterme))->node(); current->tqparent()->removeChild(current); - tqparentNode->insertChild(current, afterMeNode); + parentNode->insertChild(current, afterMeNode); KListView::movableDropEvent(d->tqparent, d->afterme); } } diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index 696802ec7..bc10f8a31 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -186,24 +186,24 @@ Document::Document(const TQDomDocument &doc) : d(new Private) /* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0. */ - TQDomNode tqparentNode; + TQDomNode parentNode; if (d->version == v0_90 || d->version == v1_0 || d->format == AtomFeed) - tqparentNode = rootNode; + parentNode = rootNode; else { // following is a HACK for broken 0.91 feeds like xanga.com's if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull()) - tqparentNode = rootNode; + parentNode = rootNode; else - tqparentNode = channelNode; + parentNode = channelNode; } // image and textinput aren't supported by Atom.. handle in case feed provides - TQDomNode n = tqparentNode.namedItem(TQString::tqfromLatin1("image")); + TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image")); if (!n.isNull()) d->image = new Image(n); - n = tqparentNode.namedItem(TQString::tqfromLatin1("textinput")); + n = parentNode.namedItem(TQString::tqfromLatin1("textinput")); if (!n.isNull()) d->textInput = new TextInput(n); @@ -214,7 +214,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) else tagName=TQString::tqfromLatin1("item"); - for (n = tqparentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { + for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { const TQDomElement e = n.toElement(); if (e.tagName() == tagName) d->articles.append(Article(e, d->format, d->version)); diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index 9c18fcaeb..72058fa05 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -186,7 +186,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema // after removing the email, str might have // the format "(Foo M. Bar)". We cut off - // tqparentheses if there are any. However, if + // parentheses if there are any. However, if // str is of the format "Foo M. Bar (President)", // we should not cut anything. diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 1729b493a..e5d4aad17 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -203,7 +203,7 @@ Modify some recent patches that were Python 2.2 only so they would still work with 2.1. Add a view.properties() method (returning a - dict of propname -> Property) for cases where a property is tqmasked + dict of propname -> Property) for cases where a property is masked by a method name. 2003-03-01 Reverted changes in Mk4py/scxx, avoid Mk4tcl warning diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp index 0873ac835..dda916abd 100644 --- a/akregator/src/mk4storage/metakit/src/column.cpp +++ b/akregator/src/mk4storage/metakit/src/column.cpp @@ -1398,30 +1398,30 @@ void c4_ColOfInts::ResizeData(int index_, int count_, bool clear_) /* _currwidth 1: 2: 4: * shiftPos 3 2 1 shift the offset right this much - * tqmaskPos 7 3 1 tqmask the offset with this + * maskPos 7 3 1 tqmask the offset with this */ const int shiftPos = _currWidth == 4 ? 1 : 4 - _currWidth; - const int tqmaskPos = (1 << shiftPos) - 1; + const int maskPos = (1 << shiftPos) - 1; // the following code is similar to c4_Column::Resize, but at bit level // turn insertion into deletion by inserting entire bytes if (count_ > 0) { unsigned off = (unsigned) index_ >> shiftPos; - int gapBytes = (count_ + tqmaskPos) >> shiftPos; + int gapBytes = (count_ + maskPos) >> shiftPos; InsertData(off, gapBytes, clear_); // oops, we might have inserted too low by a few entries - const int bits = (index_ & tqmaskPos) * _currWidth; + const int bits = (index_ & maskPos) * _currWidth; if (bits) { - const int tqmaskLow = (1 << bits) - 1; + const int maskLow = (1 << bits) - 1; // move the first few bits to start of inserted range t4_byte* p = CopyNow(off + gapBytes); - t4_byte one = *p & tqmaskLow; - *p &= ~tqmaskLow; + t4_byte one = *p & maskLow; + *p &= ~maskLow; * CopyNow(off) = one; } diff --git a/akregator/src/mk4storage/metakit/src/field.cpp b/akregator/src/mk4storage/metakit/src/field.cpp index ed5a45738..3867d6b5c 100644 --- a/akregator/src/mk4storage/metakit/src/field.cpp +++ b/akregator/src/mk4storage/metakit/src/field.cpp @@ -23,7 +23,7 @@ ///////////////////////////////////////////////////////////////////////////// // c4_Field -c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_) +c4_Field::c4_Field (const char*& description_, c4_Field* parent_) : _type (0) { _indirect = this; @@ -47,7 +47,7 @@ c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_) if (*description_ == '^') { ++description_; - _indirect = tqparent_; + _indirect = parent_; d4_assert(*description_ == ']'); } diff --git a/akregator/src/mk4storage/metakit/src/handler.cpp b/akregator/src/mk4storage/metakit/src/handler.cpp index fab473722..9bacfc9f8 100644 --- a/akregator/src/mk4storage/metakit/src/handler.cpp +++ b/akregator/src/mk4storage/metakit/src/handler.cpp @@ -397,7 +397,7 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos c4_HandlerSeq& t1 = SubEntry(col, srcPos_); c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_); - // adjust the tqparents + // adjust the parents t1._tqparent = this; t2._tqparent = &dst_; @@ -478,14 +478,14 @@ void c4_HandlerSeq::UnmappedAll() // construct meta view from a pre-parsed field tree structure // this will one day be converted to directly parse the description string -void c4_HandlerSeq::BuildMeta(int tqparent_, int colnum_, c4_View& meta_, +void c4_HandlerSeq::BuildMeta(int parent_, int colnum_, c4_View& meta_, const c4_Field& field_) { c4_IntProp pP ("P"), pC ("C"); c4_ViewProp pF ("F"); c4_StringProp pN ("N"), pT ("T"); - int n = meta_.Add(pP [tqparent_] + pC [colnum_]); + int n = meta_.Add(pP [parent_] + pC [colnum_]); c4_View fields = pF (meta_[n]); for (int i = 0; i < field_.NumSubFields(); ++i) { diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp index 4e210444f..2cd5f0841 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.cpp +++ b/akregator/src/mk4storage/metakit/tests/regress.cpp @@ -219,9 +219,9 @@ void FailExpr(const char* expr) Fail(buffer); } -int StartTest(int tqmask_, const char* name_, const char* desc_) +int StartTest(int mask_, const char* name_, const char* desc_) { - if (tqmask_) + if (mask_) { #if q4_MFC && defined(_DEBUG) TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_); diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui index bc898e15a..e2b8c63a3 100644 --- a/akregator/src/mk4storage/mk4confwidgetbase.ui +++ b/akregator/src/mk4storage/mk4confwidgetbase.ui @@ -169,7 +169,7 @@ <slot><No)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui index de6be8cf5..14adeb001 100644 --- a/akregator/src/propertieswidgetbase.ui +++ b/akregator/src/propertieswidgetbase.ui @@ -456,7 +456,7 @@ <slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot> <slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/akregator/src/settings_advancedbase.ui b/akregator/src/settings_advancedbase.ui index 9991dbe45..5943f79ad 100644 --- a/akregator/src/settings_advancedbase.ui +++ b/akregator/src/settings_advancedbase.ui @@ -150,7 +150,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui index 18c40bc81..fc7f39b0d 100644 --- a/akregator/src/settings_appearance.ui +++ b/akregator/src/settings_appearance.ui @@ -234,7 +234,7 @@ <slot>setValue(int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui index d688ea0cf..26faba49b 100644 --- a/akregator/src/settings_archive.ui +++ b/akregator/src/settings_archive.ui @@ -168,7 +168,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui index d7ba2ea79..97dbcca18 100644 --- a/akregator/src/settings_browser.ui +++ b/akregator/src/settings_browser.ui @@ -202,5 +202,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui index 83599b329..4634e5399 100644 --- a/akregator/src/settings_general.ui +++ b/akregator/src/settings_general.ui @@ -183,5 +183,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui index c28ec33b8..85f3ae941 100644 --- a/akregator/src/tagpropertieswidgetbase.ui +++ b/akregator/src/tagpropertieswidgetbase.ui @@ -128,7 +128,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kicondialog.h</includehint> </includehints> diff --git a/certmanager/certificateinfowidget.ui b/certmanager/certificateinfowidget.ui index 7549d1ecc..68f81f192 100644 --- a/certmanager/certificateinfowidget.ui +++ b/certmanager/certificateinfowidget.ui @@ -211,5 +211,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="0"/> +<layoutdefaults spacing="6" margin="0"/> </UI> diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui index 976eeb4fd..b0c2626a1 100644 --- a/certmanager/certificatewizard.ui +++ b/certmanager/certificatewizard.ui @@ -550,7 +550,7 @@ If you want to change anything, press Back and make your changes; otherwise, pre <slot access="protected">slotEmailAddressChanged(const TQString&)</slot> <slot access="protected">slotGenerateCertificate()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui index 584e7c215..0d97a877b 100644 --- a/certmanager/conf/appearanceconfigwidgetbase.ui +++ b/certmanager/conf/appearanceconfigwidgetbase.ui @@ -211,5 +211,5 @@ <slot access="protected">slotBoldClicked()</slot> <slot access="protected">slotStrikeoutClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 9647f6b81..61a427d80 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -49,7 +49,7 @@ #include <kdepimmacros.h> -#if 0 // disabled, since it is aptqparently confusing +#if 0 // disabled, since it is apparently confusing // For sync'ing kabldaprc class KABSynchronizer { diff --git a/certmanager/hierarchyanalyser.cpp b/certmanager/hierarchyanalyser.cpp index 39322abce..450c61814 100644 --- a/certmanager/hierarchyanalyser.cpp +++ b/certmanager/hierarchyanalyser.cpp @@ -54,7 +54,7 @@ void HierarchyAnalyser::slotNextKey( const GpgME::Key & key ) { return; if ( key.isRoot() || !key.chainID() || !*key.chainID() ) // root keys have themselves as issuer - we don't want them to - // have tqparents, though: + // have parents, though: mSubjectsByIssuer[0].push_back( key ); else mSubjectsByIssuer[key.chainID()].push_back( key ); diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui index 822ed3442..fc6f07a2e 100644 --- a/certmanager/lib/ui/adddirectoryservicedialog.ui +++ b/certmanager/lib/ui/adddirectoryservicedialog.ui @@ -203,5 +203,5 @@ <tabstop>PushButton3</tabstop> <tabstop>PushButton4</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index d257cc6a8..7869b1d2b 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -88,7 +88,7 @@ public: /// deselect all except one for a given protocol type (radiobutton-like exclusivity) void deselectAll( const char * protocol, TQCheckListItem* except ); - void emitChanged() { static_cast<BackendConfigWidget *>( tqparentWidget() )->emitChanged( true ); } + void emitChanged() { static_cast<BackendConfigWidget *>( parentWidget() )->emitChanged( true ); } }; // Toplevel listviewitem for a given backend (e.g. "GpgME", "Kgpg/gpg v2") diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index c5ed43b1c..cd486a864 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -633,7 +633,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog() { // I'm a bad boy and I do it all on the stack. Enough classes already :) // This is just a simple dialog around the directory-services-widget - KDialogBase dialog( mPushButton->tqparentWidget(), 0, true /*modal*/, + KDialogBase dialog( mPushButton->parentWidget(), 0, true /*modal*/, i18n( "Configure LDAP Servers" ), KDialogBase::Default|KDialogBase::Cancel|KDialogBase::Ok, KDialogBase::Ok, true /*separator*/ ); diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index 7b26a695d..59a014618 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -338,5 +338,5 @@ By clicking this button, you can remove the currently selected directory service <slot access="protected">slotMoveUp()</slot> <slot access="protected">slotMoveDown()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/indexlib/boost-compat/shared_ptr.hpp b/indexlib/boost-compat/shared_ptr.hpp index ec88ae2e1..0a3bf6d86 100644 --- a/indexlib/boost-compat/shared_ptr.hpp +++ b/indexlib/boost-compat/shared_ptr.hpp @@ -445,7 +445,7 @@ template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std:: #if (defined(__GNUC__) && (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238)) // g++ 2.9x doesn't allow static_cast<X const *>(void *) -// aptqparently EDG 2.38 also doesn't accept it +// apparently EDG 2.38 also doesn't accept it template<class D, class T> D * get_deleter(shared_ptr<T> const & p) { diff --git a/indexlib/boost-compat/weak_ptr.hpp b/indexlib/boost-compat/weak_ptr.hpp index 8a0637847..c23850079 100644 --- a/indexlib/boost-compat/weak_ptr.hpp +++ b/indexlib/boost-compat/weak_ptr.hpp @@ -51,11 +51,11 @@ public: // // has a serious problem. // -// r.px may already have been tqinvalidated. The px(r.px) +// r.px may already have been invalidated. The px(r.px) // conversion may require access to *r.px (virtual inheritance). // // It is not possible to avoid spurious access violations since -// in multithreaded programs r.px may be tqinvalidated at any point. +// in multithreaded programs r.px may be invalidated at any point. // template<class Y> @@ -106,7 +106,7 @@ public: catch(bad_weak_ptr const &) { // Q: how can we get here? - // A: another thread may have tqinvalidated r after the use_count test above. + // A: another thread may have invalidated r after the use_count test above. return shared_ptr<element_type>(); } diff --git a/indexlib/manager.h b/indexlib/manager.h index aaa087132..6224a9db4 100644 --- a/indexlib/manager.h +++ b/indexlib/manager.h @@ -51,7 +51,7 @@ class memory_manager { /** Returns the size of the block */ virtual unsigned size() const = 0; /** Resizes the block. - * This tqinvalidates all previously returned pointers + * This invalidates all previously returned pointers */ virtual void resize( unsigned ) = 0; }; diff --git a/indexlib/match.cpp b/indexlib/match.cpp index 3a56c28d8..ce2c5cff5 100644 --- a/indexlib/match.cpp +++ b/indexlib/match.cpp @@ -47,17 +47,17 @@ namespace { } indexlib::Match::Match( std::string str, unsigned flags ): - tqmasks_( 256 ), + masks_( 256 ), caseinsensitive_( flags & caseinsensitive ), pattern_rest_( str, kMin( str.size(), sizeof( unsigned ) * 8 - 1 ) ) { hot_bit_ = kMin( str.size(), sizeof( unsigned ) * 8 - 1 ); for ( unsigned i = 0; i != hot_bit_; ++i ) { if ( caseinsensitive_ ) { - setbit( tqmasks_[ ( unsigned char )std::toupper( str[ i ] ) ], i ); - setbit( tqmasks_[ ( unsigned char )std::tolower( str[ i ] ) ], i ); + setbit( masks_[ ( unsigned char )std::toupper( str[ i ] ) ], i ); + setbit( masks_[ ( unsigned char )std::tolower( str[ i ] ) ], i ); } else { - setbit( tqmasks_[ ( unsigned char )str[ i ] ], i ); + setbit( masks_[ ( unsigned char )str[ i ] ], i ); } } } @@ -69,7 +69,7 @@ bool indexlib::Match::process( const char* string ) const { unsigned state = 0; while ( *string ) { state |= 1; - state &= tqmasks_[ ( unsigned char )*string ]; + state &= masks_[ ( unsigned char )*string ]; state <<= 1; ++string; if ( getbit( state, hot_bit_ ) && ( pattern_rest_ == std::string( string, pattern_rest_.size() ) ) ) return true; diff --git a/indexlib/match.h b/indexlib/match.h index 9c8fc24f9..0c51dbf24 100644 --- a/indexlib/match.h +++ b/indexlib/match.h @@ -64,8 +64,8 @@ class Match { bool process( const char* string ) const; bool process( std::string str ) const { return process( str.c_str() ); } private: - typedef std::vector<unsigned> tqmasks_type; - tqmasks_type tqmasks_; + typedef std::vector<unsigned> masks_type; + masks_type masks_; unsigned hot_bit_; bool caseinsensitive_; std::string pattern_rest_; diff --git a/indexlib/mempool.h b/indexlib/mempool.h index 95416f080..fca5596d5 100644 --- a/indexlib/mempool.h +++ b/indexlib/mempool.h @@ -114,20 +114,20 @@ struct mempool /* : boost::noncopyable */ { friend struct list_node_manager; struct list_node_manager { protected: - const mempool* tqparent_; + const mempool* parent_; public: - explicit list_node_manager( const mempool* p = 0 ):tqparent_( p ) {} + explicit list_node_manager( const mempool* p = 0 ):parent_( p ) {} void* rw_base( unsigned idx ) const { - return tqparent_->manager_->rw_base( idx ); + return parent_->manager_->rw_base( idx ); } const void* ronly_base( unsigned idx ) const { - return tqparent_->manager_->ronly_base( idx ); + return parent_->manager_->ronly_base( idx ); } }; START_THING( list_node, thing<list_node_manager> ) - void set_tqparent( const mempool* p ) { this->tqparent_ = p; } + void set_tqparent( const mempool* p ) { this->parent_ = p; } MEMBER( uint16_t, order, 0 ) MEMBER( uint32_t, next, 2 ) MEMBER( uint32_t, prev, 6 ) diff --git a/kabc/frontend/mainWindow.ui b/kabc/frontend/mainWindow.ui index f3543f4bf..6744c23a9 100644 --- a/kabc/frontend/mainWindow.ui +++ b/kabc/frontend/mainWindow.ui @@ -1405,5 +1405,5 @@ <slot>addressBookUnlocked()</slot> <slot>fileOpenStd()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui index a524fe88f..77988764e 100644 --- a/kaddressbook/editors/imaddressbase.ui +++ b/kaddressbook/editors/imaddressbase.ui @@ -85,5 +85,5 @@ <slot>slotProtocolChanged( const TQString & )</slot> <slot>slotProtocolChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index c6cc32342..77d11794d 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -152,8 +152,8 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="0"/> -<tqlayoutfunctions spacing="KDialog::spacingHint"/> +<layoutdefaults spacing="6" margin="0"/> +<layoutfunctions spacing="KDialog::spacingHint"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 5fe18f5d3..edbb37a08 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -466,12 +466,12 @@ ResourceItem* ResourceSelection::selectedItem() const ResourceItem* ResourceSelection::findSubResourceItem( KPIM::ResourceABC *resource, const TQString &subResource ) { - TQListViewItemIterator tqparentIt( mListView ); - for ( ; *tqparentIt; ++tqparentIt ) { - if ( static_cast<ResourceItem*>(*tqparentIt)->resource() != resource ) + TQListViewItemIterator parentIt( mListView ); + for ( ; *parentIt; ++parentIt ) { + if ( static_cast<ResourceItem*>(*parentIt)->resource() != resource ) continue; - TQListViewItemIterator childIt( *tqparentIt ); + TQListViewItemIterator childIt( *parentIt ); for ( ; *childIt; ++childIt ) { ResourceItem *item = static_cast<ResourceItem*>(*childIt); if ( item->resourceIdentifier() == subResource ) diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index d4f5b2866..8e8864d85 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -99,7 +99,7 @@ KABC::AddressBook *XXPort::addressBook() const return mAddressBook; } -TQWidget *XXPort::tqparentWidget() const +TQWidget *XXPort::parentWidget() const { return mParentWidget; } diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 9b41850f8..0f24f5c0e 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -146,7 +146,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient Returns a pointer to the tqparent widget. It can be used as tqparent for message boxes. */ - TQWidget *tqparentWidget() const; + TQWidget *parentWidget() const; private slots: void slotImportActivated( const TQString& ); diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 5a981a4dd..88cd03109 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -42,7 +42,7 @@ typedef KParts::GenericFactory< KAddressbookPart > KAddressbookFactory; K_EXPORT_COMPONENT_FACTORY( libkaddressbookpart, KAddressbookFactory ) -KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName, +KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & ) : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( tqparent, name ) @@ -50,7 +50,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widget setInstance( KAddressbookFactory::instance() ); // create a canvas to insert our widget - TQWidget *canvas = new TQWidget( tqparentWidget, widgetName ); + TQWidget *canvas = new TQWidget( parentWidget, widgetName ); canvas->setFocusPolicy( TQ_ClickFocus ); setWidget( canvas ); diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h index 3991e7401..264209314 100644 --- a/kaddressbook/kaddressbook_part.h +++ b/kaddressbook/kaddressbook_part.h @@ -40,7 +40,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook TQ_OBJECT public: - KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName, + KAddressbookPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList& ); virtual ~KAddressbookPart(); diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 5091e74c9..989b360d8 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -475,5 +475,5 @@ <slot>setDisabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 834431af9..846be3898 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -196,7 +196,7 @@ void CardViewLookNFeelPage::initGUI() TQTabWidget *tabs = new TQTabWidget( this ); // Layout - TQVBox *loTab = new TQVBox( this, "tqlayouttab" ); + TQVBox *loTab = new TQVBox( this, "layouttab" ); loTab->setSpacing( spacing ); loTab->setMargin( margin ); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 31f0ac6ca..eab88e2e3 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -54,10 +54,10 @@ DynamicTip::DynamicTip( ContactListView *tqparent) void DynamicTip::maybeTip( const TQPoint &pos ) { - if (!tqparentWidget()->inherits( "ContactListView" )) + if (!parentWidget()->inherits( "ContactListView" )) return; - ContactListView *plv = (ContactListView*)tqparentWidget(); + ContactListView *plv = (ContactListView*)parentWidget(); if (!plv->tooltips()) return; @@ -109,7 +109,7 @@ void DynamicTip::maybeTip( const TQPoint &pos ) linew += fm.width( notes[i] ); if ( lastSpace >= a && notes[i] != '\n' ) - if (linew >= tqparentWidget()->width()) { + if (linew >= parentWidget()->width()) { doBreak = true; if ( lastSpace > a ) { i = lastSpace; @@ -152,7 +152,7 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, const KABC::Field::List &fields, KIMProxy *proxy ) : KListViewItem(tqparent), mAddressee(a), mFields( fields ), - tqparentListView( tqparent ), mDocument(doc), mIMProxy( proxy ) + parentListView( tqparent ), mDocument(doc), mIMProxy( proxy ) { if ( mIMProxy ) mHasIM = mIMProxy->isPresent( mAddressee.uid() ); @@ -164,15 +164,15 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, TQString ContactListViewItem::key(int column, bool ascending) const { // Preserve behaviour of TQListViewItem::key(), otherwise we cause a crash if the column does not exist - if ( column >= tqparentListView->columns() ) + if ( column >= parentListView->columns() ) return TQString(); #if KDE_VERSION >= 319 Q_UNUSED( ascending ) - if ( tqparentListView->showIM() ) { + if ( parentListView->showIM() ) { // in this case, one column is reserved for IM presence // so we have to process it differently - if ( column == tqparentListView->imColumn() ) { + if ( column == parentListView->imColumn() ) { // increment by one before converting to string so that -1 is not greater than 1 // create the sort key by taking the numeric status 0 low, 5 high, and subtracting it from 5 // so that the default ascending gives online before offline, etc. @@ -201,8 +201,8 @@ void ContactListViewItem::paintCell(TQPainter * p, if ( !p ) return; - if (tqparentListView->singleLine()) { - p->setPen( tqparentListView->alternateColor() ); + if (parentListView->singleLine()) { + p->setPen( parentListView->alternateColor() ); p->drawLine( 0, height() - 1, width, height() - 1 ); } } @@ -210,7 +210,7 @@ void ContactListViewItem::paintCell(TQPainter * p, ContactListView *ContactListViewItem::tqparent() { - return tqparentListView; + return parentListView; } @@ -230,9 +230,9 @@ void ContactListViewItem::refresh() // don't show unknown presence, it's not interesting if ( mHasIM ) { if ( mIMProxy->presenceNumeric( mAddressee.uid() ) > 0 ) - setPixmap( tqparentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) ); + setPixmap( parentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) ); else - setPixmap( tqparentListView->imColumn(), TQPixmap() ); + setPixmap( parentListView->imColumn(), TQPixmap() ); } KABC::Field::List::ConstIterator it; diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index 65c927026..5492b9161 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -72,7 +72,7 @@ public: private: KABC::Addressee mAddressee; KABC::Field::List mFields; - ContactListView *tqparentListView; + ContactListView *parentListView; KABC::AddressBook *mDocument; KIMProxy *mIMProxy; bool mHasIM; diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index fc9ac247c..03962d3a0 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( tqparentWidget(), 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\"").tqarg( url.path()) ) == KMessageBox::No) return false; } @@ -58,7 +58,7 @@ 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( tqparentWidget(), txt.tqarg( url.url() ) + KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) .tqarg( strerror( tmpFile.status() ) ) ); return false; } @@ -66,19 +66,19 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& doExport( tmpFile.file(), list ); tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); } else { TQFile file( url.path() ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( tqparentWidget(), txt.tqarg( url.path() ) ); + KMessageBox::error( parentWidget(), txt.tqarg( url.path() ) ); return false; } doExport( &file, list ); file.close(); - KMessageBox::information( tqparentWidget(), i18n( "The contacts have been exported successfully." ) ); + KMessageBox::information( parentWidget(), i18n( "The contacts have been exported successfully." ) ); return true; } @@ -86,7 +86,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& KABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const { - CSVImportDialog dlg( addressBook(), tqparentWidget() ); + CSVImportDialog dlg( addressBook(), parentWidget() ); if ( dlg.exec() ) return dlg.contacts(); else diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index 053a850e2..564fcf5fb 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -528,7 +528,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start importing the personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -536,7 +536,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const "KAddressbook will behave unresponsively.</qt>") )) return addrList; - m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", i18n("Mobile Phone Import"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -553,7 +553,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(tqparentWidget(), errStr); + KMessageBox::error(parentWidget(), errStr); delete m_progressDlg; return addrList; } @@ -575,7 +575,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) { - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start exporting the selected personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -583,7 +583,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri "KAddressbook will behave unresponsively.</qt>") )) return false; - m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", i18n("Mobile Phone Export"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -608,7 +608,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(tqparentWidget(), errStr); + KMessageBox::error(parentWidget(), errStr); delete m_progressDlg; return false; } @@ -637,7 +637,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri phone_count = memstat.used; if (memstat.free >= (int) list.count()) { - if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(), + if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(), i18n("<qt>Do you want the selected contacts to be <b>appended</b> to " "the current mobile phonebook or should they <b>tqreplace</b> all " "currently existing phonebook entries ?<br><br>" @@ -756,7 +756,7 @@ finish: if (!failedList.isEmpty()) { GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); - KMessageBox::informationList(tqparentWidget(), + 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>" "<li>The contacts contain more information per entry than the phone can store.</li>" @@ -1319,7 +1319,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start importing the personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -1327,7 +1327,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const "KAddressbook will behave unresponsively.</qt>") )) return addrList; - m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", i18n("Mobile Phone Import"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -1344,7 +1344,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(tqparentWidget(), errStr); + KMessageBox::error(parentWidget(), errStr); delete m_progressDlg; return addrList; } @@ -1366,7 +1366,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) { - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start exporting the selected personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -1374,7 +1374,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri "KAddressbook will behave unresponsively.</qt>") )) return false; - m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", i18n("Mobile Phone Export"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -1399,7 +1399,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(tqparentWidget(), errStr); + KMessageBox::error(parentWidget(), errStr); delete m_progressDlg; return false; } @@ -1428,7 +1428,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri phone_count = memstat.used; if (memstat.free >= (int) list.count()) { - if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(), + if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(), i18n("<qt>Do you want the selected contacts to be <b>appended</b> to " "the current mobile phonebook or should they <b>tqreplace</b> all " "currently existing phonebook entries ?<br><br>" @@ -1547,7 +1547,7 @@ finish: if (!failedList.isEmpty()) { GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); - KMessageBox::informationList(tqparentWidget(), + 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>" "<li>The contacts contain more information per entry than the phone can store.</li>" @@ -1575,7 +1575,7 @@ finish: KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n" + KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n" "Please ask your distributor to add gnokii at compile time.")); return addrList; } @@ -1583,7 +1583,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) { Q_UNUSED(list); - KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n" + KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n" "Please ask your distributor to add gnokii at compile time.")); return true; } diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index f5848d1ce..08fe4a108 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -49,11 +49,11 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const { TQString fileName = locateLocal( "data", "kabc/std.vcf" ); if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( tqparentWidget(), 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>" ).tqarg( fileName ) ); return KABC::AddresseeList(); } - int result = KMessageBox::questionYesNoCancel( tqparentWidget(), + int result = KMessageBox::questionYesNoCancel( parentWidget(), i18n( "Override previously imported entries?" ), i18n( "Import KDE 2 Addressbook" ), i18n("Import"), i18n("Do Not Import") ); diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index 53ec7d996..8ff5cf44d 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( tqparentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.tqarg( 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( tqparentWidget(), 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\"").tqarg( url.path()) ) == KMessageBox::No) return false; } @@ -106,7 +106,7 @@ 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( tqparentWidget(), txt.tqarg( url.url() ) + KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) .tqarg( strerror( tmpFile.status() ) ) ); return false; } @@ -114,14 +114,14 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString doExport( tmpFile.file(), list ); tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); } else { TQString filename = url.path(); TQFile file( filename ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( tqparentWidget(), txt.tqarg( filename ) ); + KMessageBox::error( parentWidget(), txt.tqarg( filename ) ); return false; } diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 71b01e6e1..59fd52eaa 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -55,7 +55,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( tqparentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 7894e9c5b..8075a7da2 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( tqparentWidget(), 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>" ).tqarg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 74b1e9dc8..d917292f7 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -131,7 +131,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS TQString msg = i18n( "You have selected a list of contacts, shall they be " "exported to several files?" ); - switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString(), i18n("Export to Several Files"), i18n("Export to One File") ) ) { + switch ( KMessageBox::questionYesNo( parentWidget(), msg, TQString(), i18n("Export to Several Files"), i18n("Export to One File") ) ) { case KMessageBox::Yes: { KURL baseUrl = KFileDialog::getExistingURL(); if ( baseUrl.isEmpty() ) @@ -146,7 +146,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS else testUrl = baseUrl.url() + "/" + (*it).givenName() + "_" + (*it).familyName(); - if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, tqparentWidget() ) ) { + if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) { counter++; url = testUrl + TQString::number( counter ) + ".vcf"; } else @@ -208,7 +208,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const #endif } else { if ( XXPortManager::importURL.isEmpty() ) - urls = KFileDialog::getOpenURLs( TQString(), "*.vcf|vCards", tqparentWidget(), + urls = KFileDialog::getOpenURLs( TQString(), "*.vcf|vCards", parentWidget(), i18n( "Select vCard to Import" ) ); else urls.append( XXPortManager::importURL ); @@ -220,7 +220,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const bool anyFailures = false; KURL::List::Iterator it; for ( it = urls.begin(); it != urls.end(); ++it ) { - if ( KIO::NetAccess::download( *it, fileName, tqparentWidget() ) ) { + if ( KIO::NetAccess::download( *it, fileName, parentWidget() ) ) { TQFile file( fileName ); @@ -253,13 +253,13 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const text = text.tqarg( (*it).url() ); text = text.tqarg( kapp->translate( "TQFile", TQString(file.errorString()).latin1() ) ); - KMessageBox::error( tqparentWidget(), text, caption ); + KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } } else { TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" ); text = text.tqarg( KIO::NetAccess::lastErrorString() ); - KMessageBox::error( tqparentWidget(), text, caption ); + KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } } @@ -267,12 +267,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const if ( !XXPortManager::importURL.isEmpty() ) { // a vcard was passed via cmd if ( addrList.isEmpty() ) { if ( anyFailures && urls.count() > 1 ) - KMessageBox::information( tqparentWidget(), + KMessageBox::information( parentWidget(), i18n( "No contacts were imported, due to errors with the vCards." ) ); else if ( !anyFailures ) - KMessageBox::information( tqparentWidget(), i18n( "The vCard does not contain any contacts." ) ); + KMessageBox::information( parentWidget(), i18n( "The vCard does not contain any contacts." ) ); } else { - VCardViewerDialog dlg( addrList, tqparentWidget() ); + VCardViewerDialog dlg( addrList, parentWidget() ); dlg.exec(); addrList = dlg.contacts(); } @@ -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( tqparentWidget(), 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\"").tqarg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -302,7 +302,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data ) tmpFile.file()->writeBlock( data.data(), data.size() ); tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); } #else KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const @@ -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( tqparentWidget(), 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\"").tqarg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -327,7 +327,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data ) stream << data; tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); } #endif @@ -338,7 +338,7 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr if ( addrList.isEmpty() ) return addrList; - VCardExportSelectionDialog dlg( tqparentWidget() ); + VCardExportSelectionDialog dlg( parentWidget() ); if ( !dlg.exec() ) return list; diff --git a/kalarm/Changelog b/kalarm/Changelog index c76cad450..90b5b05bb 100644 --- a/kalarm/Changelog +++ b/kalarm/Changelog @@ -260,7 +260,7 @@ KAlarm Change Log - Align times in alarm list. - 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 tqlayouts for right-to-left languages. +- Fix dialog layouts for right-to-left languages. - Fix time spin box tqlayout for right-to-left languages. === Version 1.2.2 --- 27 November 2004 === diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 34eeffdab..3bbe042fd 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -684,7 +684,7 @@ TQString AlarmListViewItem::key(int column, bool) const */ void AlarmListTooltip::maybeTip(const TQPoint& pt) { - AlarmListView* listView = (AlarmListView*)tqparentWidget()->tqparentWidget(); + AlarmListView* listView = (AlarmListView*)parentWidget()->parentWidget(); int column = listView->column(AlarmListView::MESSAGE_COLUMN); int xOffset = listView->contentsX(); if (listView->header()->sectionAt(pt.x() + xOffset) == column) diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index f4ea9e654..082627260 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -102,7 +102,7 @@ class PickAlarmFileRadio : public PickFileRadio virtual TQString pickFile() // called when browse button is pressed to select a file to display { return KAlarm::browseFile(i18n("Choose Text or Image File to Display"), mDefaultDir, fileEdit()->text(), - TQString(), KFile::ExistingOnly, tqparentWidget(), "pickAlarmFile"); + TQString(), KFile::ExistingOnly, parentWidget(), "pickAlarmFile"); } private: TQString mDefaultDir; // default directory for file browse button @@ -119,7 +119,7 @@ class PickLogFileRadio : public PickFileRadio virtual TQString pickFile() // called when browse button is pressed to select a log file { return KAlarm::browseFile(i18n("Choose Log File"), mDefaultDir, fileEdit()->text(), TQString(), - KFile::LocalOnly, tqparentWidget(), "pickLogFile"); + KFile::LocalOnly, parentWidget(), "pickLogFile"); } private: TQString mDefaultDir; // default directory for log file browse button diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp index f4e6941ea..ee1750e8b 100644 --- a/kalarm/lib/label.cpp +++ b/kalarm/lib/label.cpp @@ -112,7 +112,7 @@ LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name) void LabelFocusWidget::focusInEvent(TQFocusEvent*) { - Label* tqparent = (Label*)tqparentWidget(); + Label* tqparent = (Label*)parentWidget(); tqparent->activated(); } diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 30cac9789..ca7dd8241 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -125,7 +125,7 @@ class MWMimeSourceFactory : public TQMimeSourceFactory // Basic flags for the window static const TQt::WFlags WFLAGS = TQt::WStyle_StaysOnTop | TQt::WDestructiveClose; -// Error message bit tqmasks +// Error message bit masks enum { ErrMsg_Speak = 0x01, ErrMsg_AudioFile = 0x02, diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index 90b48dd85..24a444b98 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -169,7 +169,7 @@ void KAlarmPrefDlg::slotApply() TQString errmsg = mEmailPage->validate(); if (!errmsg.isEmpty()) { - showPage(pageIndex(mEmailPage->tqparentWidget())); + showPage(pageIndex(mEmailPage->parentWidget())); if (KMessageBox::warningYesNo(this, errmsg) != KMessageBox::Yes) { mValid = false; @@ -179,7 +179,7 @@ void KAlarmPrefDlg::slotApply() errmsg = mEditPage->validate(); if (!errmsg.isEmpty()) { - showPage(pageIndex(mEditPage->tqparentWidget())); + showPage(pageIndex(mEditPage->parentWidget())); KMessageBox::sorry(this, errmsg); mValid = false; return; @@ -825,12 +825,12 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame) mFontChooser = new FontColourChooser(mPage, 0, false, TQStringList(), i18n("Message Font && Color"), true, false); mPage->setStretchFactor(mFontChooser, 1); - TQFrame* tqlayoutBox = new TQFrame(mPage); - TQHBoxLayout* htqlayout = new TQHBoxLayout(tqlayoutBox); + TQFrame* layoutBox = new TQFrame(mPage); + TQHBoxLayout* htqlayout = new TQHBoxLayout(layoutBox); TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); htqlayout->addStretch(); - TQHBox* box = new TQHBox(tqlayoutBox); // to group widgets for TQWhatsThis text + TQHBox* box = new TQHBox(layoutBox); // to group widgets for TQWhatsThis text box->setSpacing(KDialog::spacingHint()/2); colourLayout->addWidget(box); TQLabel* label1 = new TQLabel(i18n("Di&sabled alarm color:"), box); @@ -840,7 +840,7 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame) TQWhatsThis::add(box, i18n("Choose the text color in the alarm list for disabled alarms.")); - box = new TQHBox(tqlayoutBox); // to group widgets for TQWhatsThis text + box = new TQHBox(layoutBox); // to group widgets for TQWhatsThis text box->setSpacing(KDialog::spacingHint()/2); colourLayout->addWidget(box); TQLabel* label2 = new TQLabel(i18n("E&xpired alarm color:"), box); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 3dd686a9e..21efed812 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -348,7 +348,7 @@ bool TrayWindow::inSystemTray() const */ void TrayTooltip::maybeTip(const TQPoint&) { - TrayWindow* tqparent = (TrayWindow*)tqparentWidget(); + TrayWindow* tqparent = (TrayWindow*)parentWidget(); TQString text; if (Daemon::monitoringAlarms()) text = kapp->aboutData()->programName(); diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui index e9b143cd5..2fd540ae5 100644 --- a/kandy/src/cmdpropertiesdialog_base.ui +++ b/kandy/src/cmdpropertiesdialog_base.ui @@ -168,5 +168,5 @@ <slot>editParameterName(TQListViewItem *)</slot> <slot access="protected">slotAccept()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kandy/src/mobilegui_base.ui b/kandy/src/mobilegui_base.ui index 3a4f139dc..62d399a1d 100644 --- a/kandy/src/mobilegui_base.ui +++ b/kandy/src/mobilegui_base.ui @@ -579,5 +579,5 @@ <slot>toggleConnection()</slot> <slot>deleteMobPhonebook()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui index c4ac2c65a..906ba139b 100644 --- a/karm/csvexportdialog_base.ui +++ b/karm/csvexportdialog_base.ui @@ -405,7 +405,7 @@ <Q_SLOTS> <slot>enableExportButton()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdateedit.h</includehint> <includehint>kdateedit.h</includehint> diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index abe8fed61..dca3cf94e 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -21,17 +21,17 @@ #include <tqpopupmenu.h> #include "mainwindow.h" -karmPart::karmPart( TQWidget *tqparentWidget, const char *widgetName, +karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name ) : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(tqparent, name), - _accel ( new KAccel( tqparentWidget ) ), - _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(tqparentWidget) ) ) + _accel ( new KAccel( parentWidget ) ), + _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) ) { // we need an instance setInstance( karmPartFactory::instance() ); // this should be your custom internal widget - _taskView = new TaskView( tqparentWidget, widgetName ); + _taskView = new TaskView( parentWidget, widgetName ); // setup PreferenceDialog. _preferences = Preferences::instance(); @@ -387,12 +387,12 @@ karmPartFactory::~karmPartFactory() s_instance = 0L; } -KParts::Part* karmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ) { // Create an instance of our Part - karmPart* obj = new karmPart( tqparentWidget, widgetName, tqparent, name ); + karmPart* obj = new karmPart( parentWidget, widgetName, tqparent, name ); // See if we are to be read-write or not if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/karm/karm_part.h b/karm/karm_part.h index bca83e32e..8550cc9b3 100644 --- a/karm/karm_part.h +++ b/karm/karm_part.h @@ -59,7 +59,7 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface friend class KarmTray; public: - karmPart(TQWidget *tqparentWidget, const char *widgetName, + karmPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name); // DCOP void quit(); @@ -126,7 +126,7 @@ class karmPartFactory : public KParts::Factory public: karmPartFactory(); virtual ~karmPartFactory(); - virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index d56dff0b2..6211deb84 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -102,7 +102,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt // If file doesn't exist, create a blank one to avoid ResourceLocal load // error. We make it user and group read/write, others read. This is - // tqmasked by the users umask. (See man creat) + // masked by the users umask. (See man creat) if ( ! remoteResource( _icalfile ) ) { int handle; @@ -310,11 +310,11 @@ TQString KarmStorage::save(TaskView* taskview) kdDebug(5970) << "entering KarmStorage::save" << endl; TQString err=TQString(); - TQPtrStack< KCal::Todo > tqparents; + TQPtrStack< KCal::Todo > parents; for (Task* task=taskview->first_child(); task; task = task->nextSibling()) { - err=writeTaskAsTodo(task, 1, tqparents ); + err=writeTaskAsTodo(task, 1, parents ); } if ( !saveCalendar() ) @@ -337,7 +337,7 @@ TQString KarmStorage::save(TaskView* taskview) } TQString KarmStorage::writeTaskAsTodo(Task* task, const int level, - TQPtrStack< KCal::Todo >& tqparents ) + TQPtrStack< KCal::Todo >& parents ) { TQString err; KCal::Todo* todo; @@ -349,16 +349,16 @@ TQString KarmStorage::writeTaskAsTodo(Task* task, const int level, return "Could not get todo from calendar"; } task->asTodo(todo); - if ( !tqparents.isEmpty() ) todo->setRelatedTo( tqparents.top() ); - tqparents.push( todo ); + if ( !parents.isEmpty() ) todo->setRelatedTo( parents.top() ); + parents.push( todo ); for ( Task* nextTask = task->firstChild(); nextTask; nextTask = nextTask->nextSibling() ) { - err = writeTaskAsTodo(nextTask, level+1, tqparents ); + err = writeTaskAsTodo(nextTask, level+1, parents ); } - tqparents.pop(); + parents.pop(); return err; } diff --git a/karm/karmstorage.h b/karm/karmstorage.h index 214dab53e..40c574d7f 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -308,7 +308,7 @@ class KarmStorage bool parseLine(TQString line, long *time, TQString *name, int *level, DesktopList* desktopList); TQString writeTaskAsTodo - (Task* task, const int level, TQPtrStack< KCal::Todo >& tqparents); + (Task* task, const int level, TQPtrStack< KCal::Todo >& parents); bool saveCalendar(); KCal::Event* baseEvent(const Task*); diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp index a1f83eb2a..b205fd7af 100644 --- a/karm/plannerparser.cpp +++ b/karm/plannerparser.cpp @@ -67,13 +67,13 @@ test cases: } // at the moment, task is still the old task or the old father task (if an endElement occurred) or not existing (if the - // new task is a top-level-task). Make task the tqparenttask, if existing. + // new task is a top-level-task). Make task the parenttask, if existing. DesktopList dl; if (level++>0) { - tqparentTask=task; - task = new Task(taskName, 0, 0, dl, tqparentTask); - task->setUid(_taskView->storage()->addTask(task, tqparentTask)); + parentTask=task; + task = new Task(taskName, 0, 0, dl, parentTask); + task->setUid(_taskView->storage()->addTask(task, parentTask)); } else { diff --git a/karm/plannerparser.h b/karm/plannerparser.h index 9334b8a5c..c5294b8d3 100644 --- a/karm/plannerparser.h +++ b/karm/plannerparser.h @@ -54,7 +54,7 @@ private: bool withInTasks; // within <tasks> ? TaskView *_taskView; Task *task; - Task *tqparentTask; + Task *parentTask; int level; // level=1: task is top-level-task }; diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 35c3eb0fb..10ef33730 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -90,7 +90,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e ) if ( _activeButton != 0) return; - TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos())) + TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos())) - mouseOffset; if ( opaque() ) { s->moveSplitter( pos, id() ); @@ -159,7 +159,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e ) } else { if ( !opaque() && e->button() == Qt::LeftButton ) { - TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos())) + TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos())) - mouseOffset; s->setRubberband( -1 ); s->moveSplitter( pos, id() ); @@ -241,8 +241,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) p.setBrush( tqcolorGroup().background() ); p.setPen( tqcolorGroup().foreground() ); p.drawRect( rect() ); - tqparentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), - tqparentWidget()->tqcolorGroup()); + parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), + parentWidget()->tqcolorGroup()); int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size @@ -256,8 +256,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) { if ( index == _activeButton ) { p.save(); - p.translate( tqparentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ), - tqparentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) ); + p.translate( parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ), + parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) ); p.tqdrawPolygon( *it, true ); p.restore(); } @@ -962,7 +962,7 @@ void KDGanttMinimizeSplitter::recalc( bool update ) } } if ( empty ) { - if ( tqparentWidget() != 0 && tqparentWidget()->inherits("KDGanttMinimizeSplitter") ) { + if ( parentWidget() != 0 && parentWidget()->inherits("KDGanttMinimizeSplitter") ) { // nested splitters; be nice maxl = maxt = 0; } else { @@ -1341,7 +1341,7 @@ KDGanttMinimizeSplitter::Direction KDGanttMinimizeSplitter::minimizeDirection() } /* - This is a copy of qGeomCalc() in qtqlayoutengine.cpp which + This is a copy of qGeomCalc() in qlayoutengine.cpp which unfortunately isn't exported. */ static inline int toFixed( int i ) { return i * 256; } diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index db9d85360..6624a4c2a 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -691,9 +691,9 @@ void KDGanttView::setShowListView( bool show ) if(listViewIsVisible == show) return; listViewIsVisible = show; if (listViewIsVisible) - myListView->tqparentWidget()->show(); + myListView->parentWidget()->show(); else - myListView->tqparentWidget()->hide(); + myListView->parentWidget()->hide(); } diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp index 9c385d46b..137c8ea3c 100644 --- a/kdgantt/KDGanttViewEventItem.cpp +++ b/kdgantt/KDGanttViewEventItem.cpp @@ -209,7 +209,7 @@ void KDGanttViewEventItem::hideMe() void KDGanttViewEventItem::showItem(bool show, int coordY) { isVisibleInGanttView = show; - tqinvalidateHeight () ; + invalidateHeight () ; if (!show) { hideMe(); return; diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp index 9c9c1e98b..ba6ad3437 100644 --- a/kdgantt/KDGanttViewItem.cpp +++ b/kdgantt/KDGanttViewItem.cpp @@ -133,7 +133,7 @@ overlapping tqchildren, call \a setPriority() for the childs. Blocking of user interaction to open item: - If you want to block users to open items used as tqparents of calendar items, + If you want to block users to open items used as parents of calendar items, call \a KDGanttView::setCalendarMode( true ); Example 1, Color: @@ -182,16 +182,16 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view, Constructs an empty Gantt item. \param type the type of the item to insert - \param tqparentItem a tqparent item under which this one goes + \param parentItem a tqparent item under which this one goes \param lvtext the text to show in the list view \param name the name by which the item can be identified. If no name is specified, a unique name will be generated */ -KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* tqparentItem, +KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* parentItem, const TQString& lvtext, const TQString& name ) : - TQListViewItem(tqparentItem,lvtext) + TQListViewItem(parentItem,lvtext) { initColorAndShapes(type); generateAndInsertName( name ); @@ -224,18 +224,18 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view, Constructs an empty Gantt item. \param type the type of the item to insert - \param tqparentItem a tqparent item under which this one goes + \param parentItem a tqparent item under which this one goes \param after another item at the same level behind which this one should go \param lvtext the text to show in the list view \param name the name by which the item can be identified. If no name is specified, a unique name will be generated */ -KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* tqparentItem, +KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* parentItem, KDGanttViewItem* after, const TQString& lvtext, const TQString& name ) : - TQListViewItem( tqparentItem, after, lvtext ) + TQListViewItem( parentItem, after, lvtext ) { initColorAndShapes(type); generateAndInsertName( name ); @@ -1547,13 +1547,13 @@ KDGanttViewItem::Shape KDGanttViewItem::stringToShape( const TQString& string ) Creates a DOM node that describes this item. \param doc the DOM document to which the node belongs - \param tqparentElement the element into which to insert this node + \param parentElement the element into which to insert this node */ void KDGanttViewItem::createNode( TQDomDocument& doc, - TQDomElement& tqparentElement ) + TQDomElement& parentElement ) { TQDomElement itemElement = doc.createElement( "Item" ); - tqparentElement.appendChild( itemElement ); + parentElement.appendChild( itemElement ); itemElement.setAttribute( "Type", typeToString( type() ) ); KDGanttXML::createDateTimeNode( doc, itemElement, "StartTime", startTime() ); diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h index 8c29760ae..88713fb3a 100644 --- a/kdgantt/KDGanttViewItem.h +++ b/kdgantt/KDGanttViewItem.h @@ -174,7 +174,7 @@ public: static KDGanttViewItem* tqfind( const TQString& name ); void createNode( TQDomDocument& doc, - TQDomElement& tqparentElement ); + TQDomElement& parentElement ); static KDGanttViewItem* createFromDomElement( KDGanttView* view, TQDomElement& element ); static KDGanttViewItem* createFromDomElement( KDGanttView* view, diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 1c076b3ca..2b63d1b1e 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -140,13 +140,13 @@ void KDTimeTableWidget::removeItemFromTasklinks( KDGanttViewItem* item) void KDTimeTableWidget::expandItem( TQListViewItem * item) { - item->tqinvalidateHeight () ; + item->invalidateHeight () ; //tqApp->processEvents(); updateMyContent(); } void KDTimeTableWidget::collapseItem( TQListViewItem * item) { - item->tqinvalidateHeight () ; + item->invalidateHeight () ; //tqApp->processEvents(); updateMyContent(); } @@ -160,7 +160,7 @@ void KDTimeTableWidget::highlightItem( TQListViewItem * item ) highlightedItem = ( KDGanttViewItem*)item; itemwashighlighted = highlightedItem->highlight(); highlightedItem->setHighlight(true); - item->tqinvalidateHeight () ; + item->invalidateHeight () ; myGanttView->myListView->contentsY(); updateMyContent(); } @@ -2517,19 +2517,19 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e ) val = 0; } } - if (endMouseDown > -x() +tqparentWidget()->width() ) { + if (endMouseDown > -x() +parentWidget()->width() ) { val = myGanttView->myCanvasView->horizontalScrollBar()->value() + myGanttView->myCanvasView->horizontalScrollBar()->lineStep(); } - repaintMe(-x(),tqparentWidget()->width()); + repaintMe(-x(),parentWidget()->width()); if ( val > -1 ) { if ( val > myGanttView->myCanvasView->horizontalScrollBar()->maxValue() ) { val = myGanttView->myCanvasView->horizontalScrollBar()->maxValue(); } myGanttView->myCanvasView->horizontalScrollBar()->setValue( val ); } - //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),tqparentWidget()->width() , e->pos().y()); + //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),parentWidget()->width() , e->pos().y()); } } @@ -3091,62 +3091,62 @@ void KDListView::startDrag () } KDCanvasText::KDCanvasText( KDTimeTableWidget* canvas, - void* tqparentItem, + void* parentItem, int type ) : TQCanvasText(canvas) { myParentType = type; - myParentItem = tqparentItem; + myParentItem = parentItem; } KDCanvasLine::KDCanvasLine( KDTimeTableWidget* canvas, - void* tqparentItem, + void* parentItem, int type ) : TQCanvasLine(canvas) { myParentType = type; - myParentItem = tqparentItem; + myParentItem = parentItem; } KDCanvasPolygonItem::KDCanvasPolygonItem( KDTimeTableWidget* canvas, - void* tqparentItem, + void* parentItem, int type ) : TQCanvasPolygonalItem( canvas ) { myParentType = type; - myParentItem = tqparentItem; + myParentItem = parentItem; } KDCanvasPolygon::KDCanvasPolygon( KDTimeTableWidget* canvas, - void* tqparentItem, + void* parentItem, int type ) : TQCanvasPolygon( canvas ) { myParentType = type; - myParentItem = tqparentItem; + myParentItem = parentItem; } KDCanvasEllipse::KDCanvasEllipse( KDTimeTableWidget* canvas, - void* tqparentItem, + void* parentItem, int type ) : TQCanvasEllipse( canvas ) { myParentType = type; - myParentItem = tqparentItem; + myParentItem = parentItem; } KDCanvasRectangle::KDCanvasRectangle( KDTimeTableWidget* canvas, - void* tqparentItem, + void* parentItem, int type ) : TQCanvasRectangle( canvas ) { myParentType = type; - myParentItem = tqparentItem; + myParentItem = parentItem; } diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h index 8c0c61485..37e70a563 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -403,7 +403,7 @@ private slots: class KDCanvasText : public TQCanvasText { public: - KDCanvasText( KDTimeTableWidget* canvas, void* tqparentItem, int type ); + KDCanvasText( KDTimeTableWidget* canvas, void* parentItem, int type ); int myParentType; void* myParentItem; }; @@ -412,7 +412,7 @@ public: class KDCanvasLine : public TQCanvasLine { public: - KDCanvasLine( KDTimeTableWidget* canvas, void* tqparentItem, int type ); + KDCanvasLine( KDTimeTableWidget* canvas, void* parentItem, int type ); int myParentType; void* myParentItem; }; @@ -421,7 +421,7 @@ public: class KDCanvasPolygonItem: public TQCanvasPolygonalItem { public: - KDCanvasPolygonItem( KDTimeTableWidget* canvas, void* tqparentItem, + KDCanvasPolygonItem( KDTimeTableWidget* canvas, void* parentItem, int type ); int myParentType; void* myParentItem; @@ -431,7 +431,7 @@ public: class KDCanvasPolygon: public TQCanvasPolygon { public: - KDCanvasPolygon( KDTimeTableWidget* canvas, void* tqparentItem, int type ); + KDCanvasPolygon( KDTimeTableWidget* canvas, void* parentItem, int type ); int myParentType; void* myParentItem; }; @@ -440,7 +440,7 @@ public: class KDCanvasEllipse: public TQCanvasEllipse { public: - KDCanvasEllipse( KDTimeTableWidget* canvas, void* tqparentItem, int type ); + KDCanvasEllipse( KDTimeTableWidget* canvas, void* parentItem, int type ); int myParentType; void* myParentItem; }; @@ -449,7 +449,7 @@ public: class KDCanvasRectangle: public TQCanvasRectangle { public: - KDCanvasRectangle( KDTimeTableWidget* canvas, void* tqparentItem, int type ); + KDCanvasRectangle( KDTimeTableWidget* canvas, void* parentItem, int type ); int myParentType; void* myParentItem; }; diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp index 7237cf31e..31d21cf9d 100644 --- a/kdgantt/KDGanttViewSummaryItem.cpp +++ b/kdgantt/KDGanttViewSummaryItem.cpp @@ -267,7 +267,7 @@ void KDGanttViewSummaryItem::hideMe() void KDGanttViewSummaryItem::showItem( bool show, int coordY ) { isVisibleInGanttView = show; - tqinvalidateHeight () ; + invalidateHeight () ; if (!show) { hideMe(); return; diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp index b7cc8a9dd..8154216bf 100644 --- a/kdgantt/KDGanttViewTaskItem.cpp +++ b/kdgantt/KDGanttViewTaskItem.cpp @@ -201,7 +201,7 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY) //qDebug("KDGanttViewTaskItem::showItem() %d %s ", (int) show, listViewText().latin1()); isVisibleInGanttView = show; - tqinvalidateHeight () ; + invalidateHeight () ; if (!show) { hideMe(); return; diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp index d0aa9bd00..51ed43f58 100644 --- a/kdgantt/KDGanttViewTaskLink.cpp +++ b/kdgantt/KDGanttViewTaskLink.cpp @@ -732,13 +732,13 @@ TQPtrList<KDGanttViewItem> KDGanttViewTaskLink::to() const Creates a DOM node that describes this task link. \param doc the DOM document to which the node belongs - \param tqparentElement the element into which to insert this node + \param parentElement the element into which to insert this node */ void KDGanttViewTaskLink::createNode( TQDomDocument& doc, - TQDomElement& tqparentElement ) + TQDomElement& parentElement ) { TQDomElement taskLinkElement = doc.createElement( "TaskLink" ); - tqparentElement.appendChild( taskLinkElement ); + parentElement.appendChild( taskLinkElement ); TQDomElement fromItemsElement = doc.createElement( "FromItems" ); taskLinkElement.appendChild( fromItemsElement ); diff --git a/kdgantt/KDGanttViewTaskLink.h b/kdgantt/KDGanttViewTaskLink.h index f09e23702..ad16265b2 100644 --- a/kdgantt/KDGanttViewTaskLink.h +++ b/kdgantt/KDGanttViewTaskLink.h @@ -89,7 +89,7 @@ public: TQString whatsThisText() const; void createNode( TQDomDocument& doc, - TQDomElement& tqparentElement ); + TQDomElement& parentElement ); static KDGanttViewTaskLink* createFromDomElement( TQDomElement& ); int linkType(); diff --git a/kdgantt/KDGanttViewTaskLinkGroup.cpp b/kdgantt/KDGanttViewTaskLinkGroup.cpp index 5b39f4b49..c6e56c0b8 100644 --- a/kdgantt/KDGanttViewTaskLinkGroup.cpp +++ b/kdgantt/KDGanttViewTaskLinkGroup.cpp @@ -280,13 +280,13 @@ KDGanttViewTaskLinkGroup* KDGanttViewTaskLinkGroup::tqfind( const TQString& name Creates a DOM node that describes this task link group. \param doc the DOM document to which the node belongs - \param tqparentElement the element into which to insert this node + \param parentElement the element into which to insert this node */ void KDGanttViewTaskLinkGroup::createNode( TQDomDocument& doc, - TQDomElement& tqparentElement ) + TQDomElement& parentElement ) { TQDomElement taskLinkGroupElement = doc.createElement( "TaskLink" ); - tqparentElement.appendChild( taskLinkGroupElement ); + parentElement.appendChild( taskLinkGroupElement ); KDGanttXML::createBoolNode( doc, taskLinkGroupElement, "Highlight", highlight() ); diff --git a/kdgantt/KDGanttViewTaskLinkGroup.h b/kdgantt/KDGanttViewTaskLinkGroup.h index 56f5d2b9e..e3959089f 100644 --- a/kdgantt/KDGanttViewTaskLinkGroup.h +++ b/kdgantt/KDGanttViewTaskLinkGroup.h @@ -65,7 +65,7 @@ public: static KDGanttViewTaskLinkGroup* tqfind( const TQString& name ); void createNode( TQDomDocument& doc, - TQDomElement& tqparentElement ); + TQDomElement& parentElement ); static KDGanttViewTaskLinkGroup* createFromDomElement( TQDomElement& ); void generateAndInsertName( const TQString& name ); diff --git a/kdgantt/Makefile.am b/kdgantt/Makefile.am index de319d12f..fe3a34ace 100644 --- a/kdgantt/Makefile.am +++ b/kdgantt/Makefile.am @@ -33,7 +33,7 @@ noinst_HEADERS = \ KDGanttViewTaskLink.h \ KDGanttXMLTools.h \ itemAttributeDialog.ui.h \ - qlayoutengine_p.h + qtqlayoutengine_p.h METASOURCES = AUTO diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui index a31e0cdb0..a3616dcad 100644 --- a/kdgantt/itemAttributeDialog.ui +++ b/kdgantt/itemAttributeDialog.ui @@ -733,5 +733,5 @@ <slot>PrioSlider_valueChanged( int val )</slot> <slot returnType="KDGanttViewItem *">getItem()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h index a071dae3e..1f03331d2 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, qtqlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp. +// of qtqlayout.cpp, qlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp. // This header file may change from version to version without notice, // or even be removed. // diff --git a/kgantt/kgantt/KGanttItem.cpp b/kgantt/kgantt/KGanttItem.cpp index 35af0c7a0..3b1525155 100644 --- a/kgantt/kgantt/KGanttItem.cpp +++ b/kgantt/kgantt/KGanttItem.cpp @@ -12,28 +12,28 @@ TQBrush KGanttItem::_selectBrush(TQColor(255,0,0)); -KGanttItem::KGanttItem(KGanttItem* tqparentItem, const TQString& text, +KGanttItem::KGanttItem(KGanttItem* parentItem, const TQString& text, const TQDateTime& start, const TQDateTime& end) : TQObject() //////////////////////////////////////////////////////// { - init(tqparentItem,text, start,end); + init(parentItem,text, start,end); } -KGanttItem::KGanttItem(KGanttItem* tqparentItem, const TQString& text, +KGanttItem::KGanttItem(KGanttItem* parentItem, const TQString& text, const TQDateTime& start, long durationMin) : TQObject() //////////////////////////////////////////////////////// { - init(tqparentItem, text, start, start.addSecs( durationMin * 60)); + init(parentItem, text, start, start.addSecs( durationMin * 60)); } void -KGanttItem::init(KGanttItem* tqparentItem, const TQString& text, +KGanttItem::init(KGanttItem* parentItem, const TQString& text, const TQDateTime& start, const TQDateTime& end) /////////////////////////////////////////////////////////////// { @@ -55,10 +55,10 @@ KGanttItem::init(KGanttItem* tqparentItem, const TQString& text, _start = start; _minDateTime = start; _end = end; _maxDateTime = end; - _tqparentItem = tqparentItem; + _parentItem = parentItem; - if(_tqparentItem) - _tqparentItem->registerItem(this); + if(_parentItem) + _parentItem->registerItem(this); } @@ -71,8 +71,8 @@ KGanttItem::~KGanttItem() printf("-> delete %s \n", getText().latin1() ); #endif - if(_tqparentItem) - _tqparentItem->unregisterItem(this); + if(_parentItem) + _parentItem->unregisterItem(this); _subitems.setAutoDelete(true); _subitems.clear(); diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h index a49c825b7..b64c73392 100644 --- a/kgantt/kgantt/KGanttItem.h +++ b/kgantt/kgantt/KGanttItem.h @@ -139,7 +139,7 @@ public: /*! * */ - KGanttItem(KGanttItem* tqparentItem, const TQString& text, + KGanttItem(KGanttItem* parentItem, const TQString& text, const TQDateTime& start, const TQDateTime& end); @@ -148,7 +148,7 @@ public: /*! * */ - KGanttItem(KGanttItem* tqparentItem, const TQString& text, + KGanttItem(KGanttItem* parentItem, const TQString& text, const TQDateTime& start, long durationMin); @@ -502,7 +502,7 @@ private: void registerItem(KGanttItem* item); void unregisterItem(KGanttItem* item); - void init(KGanttItem* tqparentItem, const TQString& text, + void init(KGanttItem* parentItem, const TQString& text, const TQDateTime& start, const TQDateTime& end); @@ -526,7 +526,7 @@ private: int _height, _style, _mode; - KGanttItem* _tqparentItem; + KGanttItem* _parentItem; TQPtrList<KGanttItem> _subitems; TQPtrList<KGanttRelation> _relations; diff --git a/kgantt/kgantt/itemedit.ui b/kgantt/kgantt/itemedit.ui index 4a4b8ac67..3810b43a7 100644 --- a/kgantt/kgantt/itemedit.ui +++ b/kgantt/kgantt/itemedit.ui @@ -12,9 +12,9 @@ <height>431</height> </rect> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -605,7 +605,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kgantt/kgantt/itemedit2.ui b/kgantt/kgantt/itemedit2.ui index face07d59..999df7bde 100644 --- a/kgantt/kgantt/itemedit2.ui +++ b/kgantt/kgantt/itemedit2.ui @@ -12,9 +12,9 @@ <height>345</height> </rect> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -322,7 +322,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index aa3916ff3..37ae46caa 100644 --- a/kioslaves/imap4/imapparser.cc +++ b/kioslaves/imap4/imapparser.cc @@ -1114,7 +1114,7 @@ mimeHeader * imapParser::parseSimplePart (parseString & inWords, localPart->setType (typeStr + "/" + subtype); - //body parameter tqparenthesized list + //body parameter parenthesized list parameters = parseParameters (inWords); { TQAsciiDictIterator < TQString > it (parameters); @@ -1628,7 +1628,7 @@ void imapParser::parseSentence (parseString & inWords) bool first = true; int stack = 0; - //find the first nesting tqparentheses + //find the first nesting parentheses while (!inWords.isEmpty () && (stack != 0 || first)) { diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h index 260f4b79f..8d57cee10 100644 --- a/kioslaves/imap4/imapparser.h +++ b/kioslaves/imap4/imapparser.h @@ -356,7 +356,7 @@ public: // generic parser routines - /** parse a tqparenthesized list */ + /** parse a parenthesized list */ void parseSentence (parseString & inWords); /** parse a literal or word, may require more data */ diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index 217b32bcc..70163b421 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -36,14 +36,14 @@ typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory; K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory ) -KitchenSyncPart::KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName, +KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList& ) : KParts::ReadOnlyPart( tqparent, name ) { setInstance( KitchenSyncFactory::instance() ); - TQVBox *canvas = new TQVBox( tqparentWidget, widgetName ); + TQVBox *canvas = new TQVBox( parentWidget, widgetName ); setWidget( canvas ); new MainWidget( this, canvas ); diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h index 82a641875..14d612610 100644 --- a/kitchensync/src/part.h +++ b/kitchensync/src/part.h @@ -33,7 +33,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart TQ_OBJECT public: - KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName, + KitchenSyncPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList& ); virtual ~KitchenSyncPart(); diff --git a/kitchensync/src/xmldiffalgo.cpp b/kitchensync/src/xmldiffalgo.cpp index 53f051f1e..b5f4890fc 100644 --- a/kitchensync/src/xmldiffalgo.cpp +++ b/kitchensync/src/xmldiffalgo.cpp @@ -87,14 +87,14 @@ void XmlDiffAlgo::appendConflictNodes(TQDomElement &leftElement, TQDomElement &r TQString id = leftChild.tagName(); if (id == "Content") - id = left.tqparentNode().nodeName(); + id = left.parentNode().nodeName(); conflictField( id, leftChild.text(), rightChild.text() ); - left.tqparentNode().removeChild( left ); + left.parentNode().removeChild( left ); left = leftElement.firstChild(); - right.tqparentNode().removeChild( right ); + right.parentNode().removeChild( right ); right = rightElement.firstChild(); } @@ -121,8 +121,8 @@ top:; compareNode( leftChild, rightChild ); if ( !left.hasChildNodes() && !right.hasChildNodes() ) { - left.tqparentNode().removeChild( left ); - right.tqparentNode().removeChild( right ); + left.parentNode().removeChild( left ); + right.parentNode().removeChild( right ); goto top; } @@ -133,13 +133,13 @@ top:; TQString id = leftChild.tagName(); if ( id == "Content" ) - id = left.tqparentNode().nodeName(); + id = left.parentNode().nodeName(); if ( id != "Type" ) //matchingField( id, leftChild.text(), rightChild.text() ); - left.tqparentNode().removeChild( left ); - right.tqparentNode().removeChild( right ); + left.parentNode().removeChild( left ); + right.parentNode().removeChild( right ); goto top; } } diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index 8f7a65037..b1355c121 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -451,9 +451,9 @@ Currently defined tags are: MDNLink SerialNumber SerNum of MDN received for this message DNSLink SerialNumber SerNUm of DSN received for this message ThreadHeads SerialNumberList MD5Hash's of all (so far discovered) - _top-level thread tqparents_ + _top-level thread parents_ ThreadParents SerialNumberList MD5Hash's of all (so far discovered) - thread tqparents + thread parents "String" is either Utf8String or (Utf16String or Latin1String), @@ -589,16 +589,16 @@ 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 tqparent, the current sort cache item is - appended to the tqparents list of unsorted tqchildren, or to that of + appended to the parents list of unsorted tqchildren, or to that of root, if there is not. A sort cache item is created in the mSortCache for the tqparent, if it is not already there. Messages with a tqparent of - -1 are appended to the "untqparented" list, which is later traversed and + -1 are appended to the "unparented" list, which is later traversed and its elements threaded. Messages with -2 as the tqparent are tqchildren 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 mSortCache, containing a sort cache item for each message that was in the - sorted file. Messages with perfect tqparents know about them, top level + sorted file. Messages with perfect parents know about them, top level messages know about that as well, all others are on a list and will be threaded later. @@ -608,16 +608,16 @@ Strategy: to mFolder->count() are looked at and a SortCacheItem is created for the ones that do not have one yet. This is where all sort cache items are created if there was no sorted file. The items created here are by definition un- - sorted as well as untqparented. On creation their sort key is figured out as + sorted as well as unparented. On creation their sort key is figured out as well. - The next step is finding tqparents for those messages that are either new, or + The next step is finding parents for those messages that are either new, or had a tqparent of -1 in the .sorted file. To that end, a dict of all sort cache items indexed by the md5 hash of their messsage id headers is created, that will be used for looking up sort cache items by message id. The list of - yet untqparented messages is then traversed and findParent() called for each + yet unparented messages is then traversed and findParent() called for each element wihch checks In-Reply-To and References headers and looks up the - sort cache item of those tqparents in the above mentioned dict. Should none be + sort cache item of those parents in the above mentioned dict. Should none be found, the item is added to a second list the items of which will be subject threaded. @@ -646,7 +646,7 @@ Strategy: the messages that are now top-level, the current thread heads, so to speak, are collected into a second dict ( QDict< QPtrList< SortCacheItem > > ) that contains for each different subject an entry holding a list of (so far - top level) messages with that subject, that are potential tqparents for + top level) messages with that subject, that are potential parents for threading by subjects. These lists are sorted by date, so the tqparent closest by date can be chosen. Sorting of these lists happens via insertion sort while they are built because not only are they expected to be short (apart @@ -709,13 +709,13 @@ What happens when a message arrives in the folder? thread, those status bits are inherited from the tqparent. The message is also added to the dict of header items, the index of messages by message id and, if applicable and if the message is threaded at top level, to the list of - potential tqparents for subject threading. + potential parents for subject threading. 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 tqparent for each item on it. This is especially important - to ensure that tqparents arriving out of order after their tqchildren still end - up as tqparents. If necessary, the entries in the .sorted file of rethreaded + to ensure that parents arriving out of order after their tqchildren 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. diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index 37c9d77bb..9340e774d 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -358,11 +358,11 @@ void AccountManager::checkMail( bool _interactive ) //----------------------------------------------------------------------------- void AccountManager::singleInvalidateIMAPFolders(KMAccount *account) { - account->tqinvalidateIMAPFolders(); + account->invalidateIMAPFolders(); } -void AccountManager::tqinvalidateIMAPFolders() +void AccountManager::invalidateIMAPFolders() { for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) singleInvalidateIMAPFolders( *it ); diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h index c88aab92d..2fac30c36 100644 --- a/kmail/accountmanager.h +++ b/kmail/accountmanager.h @@ -83,7 +83,7 @@ public: void checkMail( bool interactive = true ); /** Delete all IMAP folders and resync them */ - void tqinvalidateIMAPFolders(); + void invalidateIMAPFolders(); TQStringList getAccounts() const; diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp index 337c843cd..a4520f3c7 100644 --- a/kmail/bodyvisitor.cpp +++ b/kmail/bodyvisitor.cpp @@ -116,7 +116,7 @@ namespace KMail { // check whether to load this part or not: // look at the basic list, ask the subclass and check the tqparent if ( mBasicList.tqcontains( part->originalContentTypeStr() ) || - tqparentNeedsLoading( part ) || + parentNeedsLoading( part ) || addPartToList( part ) ) { if ( part->typeStr() != "MULTIPART" || @@ -137,7 +137,7 @@ namespace KMail { } //----------------------------------------------------------------------------- - bool BodyVisitor::tqparentNeedsLoading( KMMessagePart *msgPart ) + bool BodyVisitor::parentNeedsLoading( KMMessagePart *msgPart ) { KMMessagePart *part = msgPart; while ( part ) diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h index 4ccd16599..1f236c4a7 100644 --- a/kmail/bodyvisitor.h +++ b/kmail/bodyvisitor.h @@ -60,10 +60,10 @@ namespace KMail { protected: /** - * Checks if one of the tqparents needs loaded tqchildren + * Checks if one of the parents needs loaded tqchildren * This is e.g. needed for multipart/signed where all parts have to be loaded */ - static bool tqparentNeedsLoading( KMMessagePart * part ); + static bool parentNeedsLoading( KMMessagePart * part ); protected: TQPtrList<KMMessagePart> mParts; diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index ca95344c7..968529beb 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -549,11 +549,11 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) return; } else { KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>( (*it).current->storage() ); - KMFolderCachedImap* tqparentStorage = static_cast<KMFolderCachedImap*>( (*it).tqparent->storage() ); + KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).tqparent->storage() ); Q_ASSERT( storage ); - Q_ASSERT( tqparentStorage ); + Q_ASSERT( parentStorage ); if ( storage->imapPath().isEmpty() ) { - TQString path = mAccount->createImapPath( tqparentStorage->imapPath(), storage->folder()->name() ); + TQString path = mAccount->createImapPath( parentStorage->imapPath(), storage->folder()->name() ); if ( !storage->imapPathForCreation().isEmpty() ) path = storage->imapPathForCreation(); storage->setImapPath( path ); diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui index 4081d62ba..7ffe6c9d3 100644 --- a/kmail/composercryptoconfiguration.ui +++ b/kmail/composercryptoconfiguration.ui @@ -154,5 +154,5 @@ However, there may be local rules that require you to turn this option on. When <tabstop>mAutoEncrypt</tabstop> <tabstop>mNeverEncryptWhenSavingInDrafts</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 993c6c74f..e1fa08985 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -3020,7 +3020,7 @@ void ComposerPage::PhrasesTab::saveActiveLanguageItem() { void ComposerPage::PhrasesTab::slotNewLanguage() { - NewLanguageDialog dialog( mLanguageList, tqparentWidget(), "New", true ); + NewLanguageDialog dialog( mLanguageList, parentWidget(), "New", true ); if ( dialog.exec() == TQDialog::Accepted ) slotAddNewLanguage( dialog.language() ); } diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 098e90870..a6705c76b 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -269,10 +269,10 @@ TQString LanguageComboBox::language() const void LanguageComboBox::setLanguage( const TQString & language ) { - TQString tqparenthizedLanguage = TQString::tqfromLatin1("(%1)").tqarg( language ); + TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").tqarg( language ); for (int i = 0; i < count(); i++) // ### FIXME: use .endWith(): - if ( text(i).tqfind( tqparenthizedLanguage ) >= 0 ) { + if ( text(i).tqfind( parenthizedLanguage ) >= 0 ) { setCurrentItem(i); return; } diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index d8ada26bb..7060794cc 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -355,7 +355,7 @@ <slot>mAdd_clicked()</slot> <slot>mRemove_clicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index e16c19cb4..ae12c1241 100644 --- a/kmail/editorwatcher.cpp +++ b/kmail/editorwatcher.cpp @@ -49,13 +49,13 @@ using namespace KMail; EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith, - TQObject * tqparent, TQWidget *tqparentWidget) : + TQObject * tqparent, TQWidget *parentWidget) : TQObject( tqparent ), mUrl( url ), mMimeType( mimeType ), mOpenWith( openWith ), mEditor( 0 ), - mParentWidget( tqparentWidget ), + mParentWidget( parentWidget ), mHaveInotify( false ), mFileOpen( false ), mEditorRunning( false ), diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h index 68fdb54e4..daa35d8a8 100644 --- a/kmail/editorwatcher.h +++ b/kmail/editorwatcher.h @@ -44,11 +44,11 @@ class EditorWatcher : public TQObject * Constructs an EditorWatcher. * @param tqparent the tqparent object of this EditorWatcher, which will take care of deleting * this EditorWatcher if the tqparent is deleted. - * @param tqparentWidget the tqparent widget of this EditorWatcher, which will be used as the tqparent + * @param parentWidget the tqparent widget of this EditorWatcher, which will be used as the tqparent * widget for message dialogs. */ EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith, - TQObject *tqparent, TQWidget *tqparentWidget ); + TQObject *tqparent, TQWidget *parentWidget ); bool start(); bool fileChanged() const { return mFileModified; } signals: diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index c850cf2ec..5237787ea 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -363,7 +363,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) ); } -// Warning before save() this will return the url of the _tqparent_ folder, when creating a new one +// Warning before save() this will return the url of the _parent_ folder, when creating a new one KURL KMail::FolderDiaACLTab::imapURL() const { KURL url = mImapAccount->getUrl(); @@ -398,9 +398,9 @@ void KMail::FolderDiaACLTab::load() if ( mDlg->folder() ) { // existing folder initializeWithValuesFromFolder( mDlg->folder() ); - } else if ( mDlg->tqparentFolder() ) { + } else if ( mDlg->parentFolder() ) { // new folder - initializeWithValuesFromFolder( mDlg->tqparentFolder() ); + initializeWithValuesFromFolder( mDlg->parentFolder() ); mChanged = true; // ensure that saving happens } @@ -421,7 +421,7 @@ void KMail::FolderDiaACLTab::load() mUserIdFormat = UserName; if ( mFolderType == KMFolderTypeCachedImap ) { - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); KMFolderCachedImap* folderImap = static_cast<KMFolderCachedImap*>( folder->storage() ); if ( mUserRightsState == KMail::ACLJobs::FetchFailed || folderImap->aclListState() == KMail::ACLJobs::FetchFailed ) { @@ -450,7 +450,7 @@ void KMail::FolderDiaACLTab::load() mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) ); return; } - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); + 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() ) ); @@ -481,7 +481,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString if ( mUserRightsState != KMail::ACLJobs::Ok ) { connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); mImapAccount->getUserRights( folder, mImapPath ); } else @@ -495,7 +495,7 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder ) return; } - if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) { + if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) { KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() ); mUserRights = folderImap->userRights(); mUserRightsState = folderImap->userRightsState(); @@ -506,14 +506,14 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder ) void KMail::FolderDiaACLTab::startListing() { // List ACLs of folder - or its tqparent, if creating a new folder - mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(), mImapPath ); + mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath ); connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )), this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) ); } void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList ) { - if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) ) { + if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) { disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )), this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) ); @@ -723,15 +723,15 @@ bool KMail::FolderDiaACLTab::save() mACLList = aclList; - KMFolderImap* tqparentImap = mDlg->tqparentFolder() ? static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) : 0; + KMFolderImap* parentImap = mDlg->parentFolder() ? static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) : 0; if ( mDlg->isNewFolder() ) { // The folder isn't created yet, wait for it // It's a two-step process (mkdir+listDir) so we wait for the dir listing to be complete - connect( tqparentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ), + connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ), this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) ); } else { - slotDirectoryListingFinished( tqparentImap ); + slotDirectoryListingFinished( parentImap ); } return true; } @@ -739,7 +739,7 @@ bool KMail::FolderDiaACLTab::save() void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f) { if ( !f || - f != static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) || + f != static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) || !mDlg->folder() || !mDlg->folder()->storage() ) { emit readyForAccept(); diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index ac93431f8..7c893851a 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -92,9 +92,9 @@ void KMail::FolderDiaQuotaTab::load() if ( mDlg->folder() ) { // existing folder initializeWithValuesFromFolder( mDlg->folder() ); - } else if ( mDlg->tqparentFolder() ) { + } else if ( mDlg->parentFolder() ) { // new folder - initializeWithValuesFromFolder( mDlg->tqparentFolder() ); + initializeWithValuesFromFolder( mDlg->parentFolder() ); } if ( mFolderType == KMFolderTypeCachedImap ) { @@ -114,7 +114,7 @@ void KMail::FolderDiaQuotaTab::load() mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) ); return; } - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); + 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() ) ); @@ -144,7 +144,7 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri } connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ), this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ) ); - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); mImapAccount->getStorageQuotaInfo( folder, mImapPath ); } @@ -152,7 +152,7 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder, KIO::Job* job, const KMail::QuotaInfo& info ) { - if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) { + if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) { //KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() ); disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )), diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui index 8cc7130c5..b154aac12 100644 --- a/kmail/folderpropertiesdialog.ui +++ b/kmail/folderpropertiesdialog.ui @@ -633,6 +633,6 @@ <Q_SLOTS> <slot access="protected">slotChangeIcon( TQString )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index 72547d8d2..469f03f11 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -977,21 +977,21 @@ void FolderStorage::readFolderIdsFile() { if ( !mExportsSernums ) return; if ( KMMsgDict::mutableInstance()->readFolderIds( *this ) == -1 ) { - tqinvalidateFolder(); + invalidateFolder(); } if ( !KMMsgDict::mutableInstance()->hasFolderIds( *this ) ) { - tqinvalidateFolder(); + invalidateFolder(); } } -void FolderStorage::tqinvalidateFolder() +void FolderStorage::invalidateFolder() { if ( !mExportsSernums ) return; unlink(TQFile::encodeName( indexLocation()) + ".sorted"); unlink(TQFile::encodeName( indexLocation()) + ".ids"); fillMessageDict(); KMMsgDict::mutableInstance()->writeFolderIds( *this ); - emit tqinvalidated( folder() ); + emit invalidated( folder() ); } diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index ab58d4fdf..9ff0b67f0 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -438,8 +438,8 @@ signals: /** Emitted when the folder was closed and ticket owners have to reopen */ void closed( KMFolder* ); - /** Emitted when the serial numbers of this folder were tqinvalidated. */ - void tqinvalidated( KMFolder * ); + /** Emitted when the serial numbers of this folder were invalidated. */ + void invalidated( KMFolder * ); /** Emitted when the name of the folder changes. */ void nameChanged(); @@ -554,7 +554,7 @@ protected: friend class KMMsgDict; /** Inserts messages into the message dictionary. The messages will get * new serial numbers. This is only used on newly appeared folders, where - * there is no .ids file yet, or when that has been tqinvalidated. */ + * there is no .ids file yet, or when that has been invalidated. */ virtual void fillMessageDict() {} /** Read the on-disk cache of serial numbers of messages in this store @@ -584,10 +584,10 @@ friend class KMMsgDict; * @p sernum */ void replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx ); - /** Called when serial numbers for a folder are tqinvalidated, - tqinvalidates/recreates data structures dependent on the + /** Called when serial numbers for a folder are invalidated, + invalidates/recreates data structures dependent on the serial numbers for this folder */ - void tqinvalidateFolder(); + void invalidateFolder(); /** Called by KMFolder::remove() to delete the actual contents. At the time of the call the folder has already been closed, and diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp index e227113db..6e1a2f88c 100644 --- a/kmail/folderutil.cpp +++ b/kmail/folderutil.cpp @@ -28,18 +28,18 @@ using namespace KMail; using namespace FolderUtil; -KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir, +KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir, const TQString &folderName, const TQString &namespaceName, KMFolderType localFolderType ) { KMFolder *newFolder = 0; - if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeImap ) { - KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( tqparentFolder->storage() ); + if ( parentFolder && parentFolder->folderType() == KMFolderTypeImap ) { + KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( parentFolder->storage() ); KMAcctImap *anAccount = selectedStorage->account(); // check if a connection is available BEFORE creating the folder if (anAccount->makeConnection() == ImapAccountBase::Connected) { - newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, tqparentDir ); + newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, parentDir ); if ( newFolder ) { TQString imapPath, tqparent; if ( !namespaceName.isEmpty() ) { @@ -52,15 +52,15 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolder KMFolderImap* newStorage = static_cast<KMFolderImap*>( newFolder->storage() ); selectedStorage->createFolder(folderName, tqparent); // create it on the server newStorage->initializeFrom( selectedStorage, imapPath, TQString() ); - static_cast<KMFolderImap*>(tqparentFolder->storage())->setAccount( selectedStorage->account() ); + static_cast<KMFolderImap*>(parentFolder->storage())->setAccount( selectedStorage->account() ); return newFolder; } } - } else if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeCachedImap ) { + } else if ( parentFolder && parentFolder->folderType() == KMFolderTypeCachedImap ) { newFolder = kmkernel->dimapFolderMgr()->createFolder( folderName, false, KMFolderTypeCachedImap, - tqparentDir ); + parentDir ); if ( newFolder ) { - KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( tqparentFolder->storage() ); + KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( parentFolder->storage() ); KMFolderCachedImap* newStorage = static_cast<KMFolderCachedImap*>( newFolder->storage() ); newStorage->initializeFrom( selectedStorage ); if ( !namespaceName.isEmpty() ) { @@ -75,7 +75,7 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolder // local folder Q_ASSERT( localFolderType == KMFolderTypeMaildir || localFolderType == KMFolderTypeMbox ); newFolder = kmkernel->folderMgr()->createFolder( folderName, false, localFolderType, - tqparentDir ); + parentDir ); return newFolder; } diff --git a/kmail/folderutil.h b/kmail/folderutil.h index 9e1ac419c..255929870 100644 --- a/kmail/folderutil.h +++ b/kmail/folderutil.h @@ -35,16 +35,16 @@ namespace FolderUtil /** * Low-level function to create a subfolder for a folder of any kind. * - * @param tqparentFolder tqparent folder of the folder that should be created. Can be 0 in case of + * @param parentFolder tqparent folder of the folder that should be created. Can be 0 in case of * local folders - * @param tqparentDir tqparent folder directory, which should be the folder directory of tqparentFolder + * @param parentDir tqparent folder directory, which should be the folder directory of parentFolder * @param folderName the name the newly created folder should have * @param namespaceName for (d)IMAP folders, the namespace the new folder should be in. Can be empty. * @param localFolderType for local folders, this determines if the folder should be MBOX or maildir * * @return the newly created folder or 0 in case an error occured */ -KMFolder *createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir, +KMFolder *createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir, const TQString &folderName, const TQString &namespaceName, KMFolderType localFolderType ); diff --git a/kmail/headeritem.h b/kmail/headeritem.h index 1912d901f..c4a9a9309 100644 --- a/kmail/headeritem.h +++ b/kmail/headeritem.h @@ -64,7 +64,7 @@ public: ~SortCacheItem() { if(mUnsortedChildren) free(mUnsortedChildren); } /** The tqparent node of the item in the threading hierarchy. 0 if the item - * is at top level, which is the default. Can only be set by tqparents. */ + * is at top level, which is the default. Can only be set by parents. */ SortCacheItem *tqparent() const { return mParent; } /** * Returs whether the item is so far imperfectly threaded. diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index 2ed869b61..67755effa 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -115,8 +115,8 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event ) if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mStatusCombo) ) { KMMainWidget *mainWidget = 0; - // Travel up the tqparents list until we find the main widget - for ( TQWidget *curWidget = tqparentWidget(); curWidget; curWidget = curWidget->tqparentWidget() ) { + // Travel up the parents list until we find the main widget + for ( TQWidget *curWidget = parentWidget(); curWidget; curWidget = curWidget->parentWidget() ) { mainWidget = ::tqqt_cast<KMMainWidget *>( curWidget ); if ( mainWidget ) break; diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 4b0c32d53..d82ba5cc9 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -417,7 +417,7 @@ namespace KMail { { // There isn't much point in asking the server about a user's rights on his own inbox, // it might not be the effective permissions (at least with Cyrus, one can admin his own inbox, - // even after a SETACL that removes the admin permissions. Other imap servers aptqparently + // even after a SETACL that removes the admin permissions. Other imap servers apparently // don't even allow removing one's own admin permission, so this code won't hurt either). if ( imapPath == "/INBOX/" ) { if ( tqparent->folderType() == KMFolderTypeImap ) @@ -1138,7 +1138,7 @@ namespace KMail { } //----------------------------------------------------------------------------- - void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* tqparentKMPart, + void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, DwBodyPart * tqparent, const DwMessage * dwmsg ) { int tqchildren; @@ -1146,7 +1146,7 @@ namespace KMail { { stream >> tqchildren; KMMessagePart* part = new KMMessagePart( stream ); - part->setParent( tqparentKMPart ); + part->setParent( parentKMPart ); mBodyPartList.append( part ); kdDebug(5006) << "ImapAccountBase::constructParts - created id " << part->partSpecifier() << " of type " << part->originalContentTypeStr() << endl; @@ -1170,8 +1170,8 @@ namespace KMail { } else dwpart = 0; - if ( !tqparentKMPart ) - tqparentKMPart = part; + if ( !parentKMPart ) + parentKMPart = part; if (tqchildren > 0) { @@ -1186,7 +1186,7 @@ namespace KMail { } KMMessagePart* newParentKMPart = part; if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as tqparent - newParentKMPart = tqparentKMPart; + newParentKMPart = parentKMPart; constructParts( stream, tqchildren, newParentKMPart, newtqparent, newmsg ); } diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index eee46417d..4b5cda92c 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -510,7 +510,7 @@ namespace KMail { /** * Build KMMessageParts and DwBodyParts from the bodystructure-stream */ - void constructParts( TQDataStream & stream, int count, KMMessagePart* tqparentKMPart, + void constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, DwBodyPart * tqparent, const DwMessage * dwmsg ); /** Migrate the prefix */ diff --git a/kmail/imapjob.h b/kmail/imapjob.h index 55aa02ddb..76174b5f3 100644 --- a/kmail/imapjob.h +++ b/kmail/imapjob.h @@ -65,7 +65,7 @@ public: virtual ~ImapJob(); void setParentFolder( const KMFolderImap* tqparent ); - KPIM::ProgressItem* tqparentProgressItem() const { return mParentProgressItem; } + KPIM::ProgressItem* parentProgressItem() const { return mParentProgressItem; } void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; } private slots: diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index 9aaf4b957..a84ecf519 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -39,11 +39,11 @@ using namespace KMail; -KMail::ImportJob::ImportJob( TQWidget *tqparentWidget ) - : TQObject( tqparentWidget ), +KMail::ImportJob::ImportJob( TQWidget *parentWidget ) + : TQObject( parentWidget ), mArchive( 0 ), mRootFolder( 0 ), - mParentWidget( tqparentWidget ), + mParentWidget( parentWidget ), mNumberOfImportedMessages( 0 ), mCurrentFolder( 0 ), mCurrentMessage( 0 ), @@ -280,19 +280,19 @@ static TQString folderNameForDirectoryName( const TQString &dirName ) return returnName; } -KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName, +KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName, mode_t subFolderPermissions ) { - if ( !tqparentFolder->createChildFolder() ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( tqparentFolder->name() ) ); + if ( !parentFolder->createChildFolder() ) { + abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parentFolder->name() ) ); return 0; } KMFolder *subFolder = 0; - subFolder = dynamic_cast<KMFolder*>( tqparentFolder->child()->hasNamedFolder( subFolderName ) ); + subFolder = dynamic_cast<KMFolder*>( parentFolder->child()->hasNamedFolder( subFolderName ) ); if ( !subFolder ) { - subFolder = createSubFolder( tqparentFolder, subFolderName, subFolderPermissions ); + subFolder = createSubFolder( parentFolder, subFolderName, subFolderPermissions ); } return subFolder; } diff --git a/kmail/importjob.h b/kmail/importjob.h index ddb009113..d0f4fe488 100644 --- a/kmail/importjob.h +++ b/kmail/importjob.h @@ -56,7 +56,7 @@ class ImportJob : public TQObject public: - explicit ImportJob( TQWidget *tqparentWidget = 0 ); + explicit ImportJob( TQWidget *parentWidget = 0 ); ~ImportJob(); void start(); void setFile( const KURL &archiveFile ); @@ -87,7 +87,7 @@ class ImportJob : public TQObject void queueFolders(); void importNextDirectory(); KMFolder* createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions ); - KMFolder* getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName, + KMFolder* getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName, mode_t subFolderPermissions ); void enqueueMessages( const KArchiveDirectory *dir, KMFolder *folder ); void messageAdded(); diff --git a/kmail/keyresolver.h b/kmail/keyresolver.h index 0765459f9..c7ec0430d 100644 --- a/kmail/keyresolver.h +++ b/kmail/keyresolver.h @@ -101,14 +101,14 @@ namespace Kleo { \section Step 4: Get signing keys. If, after key resolving, signing is still requested and - aptqparently possible, you can get the result of all this by + apparently possible, you can get the result of all this by iterating over the available message formats and retrieving the set of signing keys to use with a call to \c signingKeys(). \section Step 5: Get encrytion key sets. If after key resolving, encryption is still requested and - aptqparently possible, you can get the result of all this by + apparently possible, you can get the result of all this by calling \c encryptionItems() with the current message format at hand as its argument. diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index ddc16b233..796ac382f 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -451,7 +451,7 @@ TQString KMAccount::importPassword(const TQString &aStr) return encryptStr(result); } -void KMAccount::tqinvalidateIMAPFolders() +void KMAccount::invalidateIMAPFolders() { // Default: Don't do anything. The IMAP account will handle it } diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 02df2421c..86e2f6956 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -210,7 +210,7 @@ public: /** * If this account is a disconnected IMAP account, tqinvalidate it. */ - virtual void tqinvalidateIMAPFolders(); + virtual void invalidateIMAPFolders(); /** * Determines whether the account can be checked, currently. diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp index 134a71020..0c89e6b13 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/kmail/kmacctcachedimap.cpp @@ -310,7 +310,7 @@ void KMAcctCachedImap::addLastUnreadMsgCount( const KMFolderCachedImap *folder, void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) { ImapAccountBase::readConfig( config ); - // Aptqparently this method is only ever called once (from KMKernel::init) so this is ok + // Apparently this method is only ever called once (from KMKernel::init) so this is ok mPreviouslyDeletedFolders = config.readListEntry( "deleted-folders" ); mDeletedFolders.clear(); // but just in case... const TQStringList oldPaths = config.readListEntry( "renamed-folders-paths" ); @@ -336,12 +336,12 @@ void KMAcctCachedImap::writeConfig( KConfig/*Base*/ & config ) /*const*/ { config.writeEntry( "groupwareType", mGroupwareType ); } -void KMAcctCachedImap::tqinvalidateIMAPFolders() +void KMAcctCachedImap::invalidateIMAPFolders() { - tqinvalidateIMAPFolders( mFolder ); + invalidateIMAPFolders( mFolder ); } -void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder ) +void KMAcctCachedImap::invalidateIMAPFolders( KMFolderCachedImap* folder ) { if( !folder || !folder->folder() ) return; @@ -361,7 +361,7 @@ void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder ) KMFolder *f = *it; if( f && f->folderType() == KMFolderTypeCachedImap ) { KMFolderCachedImap *cfolder = static_cast<KMFolderCachedImap*>(f->storage()); - // This tqinvalidates the folder completely + // This invalidates the folder completely cfolder->setUidValidity("INVALID"); cfolder->writeUidCache(); } diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h index f045ca7fb..a9350c3ce 100644 --- a/kmail/kmacctcachedimap.h +++ b/kmail/kmacctcachedimap.h @@ -98,8 +98,8 @@ public: /** * Invalidate the local cache. */ - virtual void tqinvalidateIMAPFolders(); - virtual void tqinvalidateIMAPFolders( KMFolderCachedImap* ); + virtual void invalidateIMAPFolders(); + virtual void invalidateIMAPFolders( KMFolderCachedImap* ); /** * Remember that a folder got explicitely deleted - including all child folders diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 1b7a508f0..63a6df14e 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -60,10 +60,10 @@ using KRecentAddress::RecentAddresses; typedef KParts::GenericFactory< KMailPart > KMailFactory; K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory ) -KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName, +KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &) : DCOPObject("KMailIface"), KParts::ReadOnlyPart(tqparent, name), - mParentWidget( tqparentWidget ) + mParentWidget( parentWidget ) { kdDebug(5006) << "KMailPart()" << endl; kdDebug(5006) << " InstanceName: " << kapp->instanceName() << endl; @@ -99,7 +99,7 @@ KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName, kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. // create a canvas to insert our widget - TQWidget *canvas = new TQWidget(tqparentWidget, widgetName); + TQWidget *canvas = new TQWidget(parentWidget, widgetName); canvas->setFocusPolicy(TQ_ClickFocus); setWidget(canvas); KGlobal::iconLoader()->addAppDir("kmail"); @@ -231,7 +231,7 @@ void KMailPart::exit() delete this; } -TQWidget* KMailPart::tqparentWidget() const +TQWidget* KMailPart::parentWidget() const { return mParentWidget; } @@ -244,7 +244,7 @@ KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *tqparent ) KMainWindow * KMailStatusBarExtension::mainWindow() const { - return static_cast<KMainWindow*>( mParent->tqparentWidget() ); + return static_cast<KMainWindow*>( mParent->parentWidget() ); } #include "kmail_part.moc" diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 414ff384e..d47041cc2 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -54,11 +54,11 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar Q_OBJECT TQ_OBJECT public: - KMailPart(TQWidget *tqparentWidget, const char *widgetName, + KMailPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &); virtual ~KMailPart(); - TQWidget* tqparentWidget() const; + TQWidget* parentWidget() const; static KAboutData *createAboutData(); diff --git a/kmail/kmail_part.rc b/kmail/kmail_part.rc index 5c4d034f3..fb4794dfd 100644 --- a/kmail/kmail_part.rc +++ b/kmail/kmail_part.rc @@ -22,7 +22,7 @@ <Action name="file_print" /> <Separator/> <Action name="expire_all_folders" /> - <Action name="file_tqinvalidate_imap_cache"/> + <Action name="file_invalidate_imap_cache"/> <Action name="empty_trash"/> <Separator/> <Action name="online_status" /> diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 25a90fd74..bf0e5b8c3 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -1702,16 +1702,16 @@ void KMailICalIfaceImpl::readConfig() // Read remaining options const bool hideFolders = GlobalSettings::self()->hideGroupwareFolders(); - TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent(); + TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent(); // Find the folder tqparent KMFolderDir* folderParentDir; KMFolderType folderType; - KMFolder* folderParent = kmkernel->findFolderById( tqparentName ); + KMFolder* folderParent = kmkernel->findFolderById( parentName ); if( folderParent == 0 ) { // Parent folder not found. It was probably deleted. The user will have to // configure things again. - kdDebug(5006) << "Groupware folder " << tqparentName << " not found. Groupware functionality disabled" << endl; + kdDebug(5006) << "Groupware folder " << parentName << " not found. Groupware functionality disabled" << endl; // Or maybe the inbox simply wasn't created on the first startup KMAccount* account = kmkernel->acctMgr()->tqfind( GlobalSettings::self()->theIMAPResourceAccount() ); Q_ASSERT( account ); @@ -1771,12 +1771,12 @@ void KMailICalIfaceImpl::readConfig() if( noneFound || mustFix ) { TQString msg; - TQString tqparentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name(); + TQString parentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name(); if ( noneFound ) { // 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(tqparentFolderName); + " and the IMAP resource will be disabled").tqarg(parentFolderName); } else { // Some subfolders were found, be more precise TQString operations = "<ul>"; @@ -1794,7 +1794,7 @@ void KMailICalIfaceImpl::readConfig() 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(tqparentFolderName, operations); + " and the IMAP resource will be disabled").tqarg(parentFolderName, operations); } @@ -1959,8 +1959,8 @@ void KMailICalIfaceImpl::readConfig() void KMailICalIfaceImpl::slotCheckDone() { - TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent(); - KMFolder* folderParent = kmkernel->findFolderById( tqparentName ); + TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent(); + KMFolder* folderParent = kmkernel->findFolderById( parentName ); //kdDebug(5006) << k_funcinfo << " folderParent=" << folderParent << endl; if ( folderParent ) // cool it exists now { @@ -2003,9 +2003,9 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType folder = mFolderParentDir->createFolder( localizedDefaultFolderName( contentsType ), false, type ); if( mFolderType == KMFolderTypeImap ) { - KMFolderImap* tqparentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() ); - tqparentFolder->createFolder( localizedDefaultFolderName( contentsType ) ); - static_cast<KMFolderImap*>( folder->storage() )->setAccount( tqparentFolder->account() ); + KMFolderImap* parentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() ); + parentFolder->createFolder( localizedDefaultFolderName( contentsType ) ); + static_cast<KMFolderImap*>( folder->storage() )->setAccount( parentFolder->account() ); } // Groupware folder created, use the global setting for storage format setStorageFormat( folder, globalStorageFormat() ); @@ -2293,11 +2293,11 @@ bool KMailICalIfaceImpl::addSubresource( const TQString& resource, kdDebug(5006) << "Adding subresource to tqparent: " << tqparent << " with name: " << resource << endl; kdDebug(5006) << "contents type: " << contentsType << endl; KMFolder *folder = findResourceFolder( tqparent ); - KMFolderDir *tqparentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir; - if ( !tqparentFolderDir || tqparentFolderDir->hasNamedFolder( resource ) ) return false; + KMFolderDir *parentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir; + if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false; TQString msg; - if ( tqparentFolderDir->owner() && !tqparentFolderDir->owner()->isValidName( resource, msg ) ) { + if ( parentFolderDir->owner() && !parentFolderDir->owner()->isValidName( resource, msg ) ) { KMessageBox::error( 0, msg ); return false; } @@ -2305,7 +2305,7 @@ bool KMailICalIfaceImpl::addSubresource( const TQString& resource, KMFolderType type = mFolderType; if( type == KMFolderTypeUnknown ) type = KMFolderTypeMaildir; - KMFolder* newFolder = tqparentFolderDir->createFolder( resource, false, type ); + KMFolder* newFolder = parentFolderDir->createFolder( resource, false, type ); if ( !newFolder ) return false; if( mFolderType == KMFolderTypeImap ) static_cast<KMFolderImap*>( folder->storage() )->createFolder( resource ); diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 1fe29b6b3..3f83fad61 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -216,7 +216,7 @@ KMMessage *KMCommand::retrievedMessage() const return mRetrievedMsgs.getFirst(); } -TQWidget *KMCommand::tqparentWidget() const +TQWidget *KMCommand::parentWidget() const { return mParent; } @@ -558,7 +558,7 @@ KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url, KMCommand::Result KMMailtoAddAddrBookCommand::execute() { KAddrBookExternal::addEmail( KMMessage::decodeMailtoUrl( mUrl.path() ), - tqparentWidget() ); + parentWidget() ); return OK; } @@ -573,7 +573,7 @@ KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url, KMCommand::Result KMMailtoOpenAddrBookCommand::execute() { KAddrBookExternal::openEmail( KMMessage::decodeMailtoUrl( mUrl.path() ), - tqparentWidget() ); + parentWidget() ); return OK; } @@ -633,10 +633,10 @@ KMCommand::Result KMUrlSaveCommand::execute() if ( mUrl.isEmpty() ) return OK; KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString(), - tqparentWidget() ); + parentWidget() ); if ( saveUrl.isEmpty() ) return Canceled; - if ( KIO::NetAccess::exists( saveUrl, false, tqparentWidget() ) ) + if ( KIO::NetAccess::exists( saveUrl, false, parentWidget() ) ) { if (KMessageBox::warningContinueCancel(0, i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>") @@ -1006,7 +1006,7 @@ KMCommand::Result KMOpenMsgCommand::execute() { if ( mUrl.isEmpty() ) { mUrl = KFileDialog::getOpenURL( ":OpenMessage", "message/rfc822 application/mbox", - tqparentWidget(), i18n("Open Message") ); + parentWidget(), i18n("Open Message") ); } if ( mUrl.isEmpty() ) { setDeletesItself( false ); @@ -1043,7 +1043,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job ) if ( mMsgString.compare( 0, 5, "From ", 5 ) == 0 ) { startOfMessage = mMsgString.tqfind( '\n' ); if ( startOfMessage == -1 ) { - KMessageBox::sorry( tqparentWidget(), + KMessageBox::sorry( parentWidget(), i18n( "The file does not contain a message." ) ); setResult( Failed ); emit completed( this ); @@ -1071,7 +1071,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job ) dwMsg->Parse(); // check whether we have a message ( no headers => this isn't a message ) if ( dwMsg->Headers().NumFields() == 0 ) { - KMessageBox::sorry( tqparentWidget(), + KMessageBox::sorry( parentWidget(), i18n( "The file does not contain a message." ) ); delete dwMsg; dwMsg = 0; setResult( Failed ); @@ -1452,7 +1452,7 @@ KMCommand::Result KMRedirectCommand::execute() if ( !msg || !msg->codec() ) return Failed; - RedirectDialog dlg( tqparentWidget(), "redirect", true, + RedirectDialog dlg( parentWidget(), "redirect", true, kmkernel->msgSender()->sendImmediate() ); if (dlg.exec()==TQDialog::Rejected) return Failed; @@ -1650,7 +1650,7 @@ KMCommand::Result KMSeStatusCommand::execute() TQValueListIterator<TQ_UINT32> it; int idx = -1; KMFolder *folder = 0; - bool tqparentqStatus = false; + bool parentqStatus = false; // Toggle actions on threads toggle the whole thread // depending on the state of the tqparent. @@ -1660,9 +1660,9 @@ KMCommand::Result KMSeStatusCommand::execute() if (folder) { msg = folder->getMsgBase(idx); if (msg && (msg->status()&mtqStatus)) - tqparentqStatus = true; + parentqStatus = true; else - tqparentqStatus = false; + parentqStatus = false; } } TQMap< KMFolder*, TQValueList<int> > folderMap; @@ -1678,7 +1678,7 @@ KMCommand::Result KMSeStatusCommand::execute() mytqStatus = true; else mytqStatus = false; - if (mytqStatus != tqparentqStatus) + if (mytqStatus != parentqStatus) continue; } } @@ -1994,7 +1994,7 @@ KMCommand::Result KMCopyCommand::execute() msg = srcFolder->getMsg(idx); // corrupt IMAP cache, see FolderStorage::getMsg() if ( msg == 0 ) { - KMessageBox::error( tqparentWidget(), i18n("Corrupt IMAP cache detected in folder %1. " + KMessageBox::error( parentWidget(), i18n("Corrupt IMAP cache detected in folder %1. " "Copying of messages aborted.").tqarg( srcFolder->prettyURL() ) ); deleteLater(); return Failed; @@ -2534,7 +2534,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() // considered attachments if ( it.key()->msgPart().fileName().stripWhiteSpace().isEmpty() && ( it.key()->msgPart().name().stripWhiteSpace().isEmpty() || - !it.key()->tqparentNode() ) ) { + !it.key()->parentNode() ) ) { PartNodeMessageMap::iterator delIt = it; ++it; mAttachmentMap.remove( delIt ); @@ -2555,7 +2555,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() if ( mAttachmentMap.count() > 1 ) { // get the dir dirUrl = KDirSelectDialog::selectDirectory( TQString(), false, - tqparentWidget(), + parentWidget(), i18n("Save Attachments To") ); if ( !dirUrl.isValid() ) { setResult( Canceled ); @@ -2577,7 +2577,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() s = node->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' ); if ( s.isEmpty() ) s = i18n("filename for an unnamed attachment", "attachment.1"); - url = KFileDialog::getSaveURL( s, TQString(), tqparentWidget(), + url = KFileDialog::getSaveURL( s, TQString(), parentWidget(), TQString() ); if ( url.isEmpty() ) { setResult( Canceled ); @@ -2641,8 +2641,8 @@ void KMSaveAttachmentsCommand::slotSaveAll() } - if ( KIO::NetAccess::exists( curUrl, false, tqparentWidget() ) ) { - if ( KMessageBox::warningContinueCancel( tqparentWidget(), + 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() ), i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) { @@ -2666,7 +2666,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, bool bSaveEncrypted = false; bool bEncryptedParts = node->encryptionState() != KMMsgNotEncrypted; if( bEncryptedParts ) - if( KMessageBox::questionYesNo( tqparentWidget(), + if( KMessageBox::questionYesNo( parentWidget(), i18n( "The part %1 of the message is encrypted. Do you want to keep the encryption when saving?" ). arg( url.fileName() ), i18n( "KMail Question" ), i18n("Keep Encryption"), i18n("Do Not Keep") ) == @@ -2675,7 +2675,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, bool bSaveWithSig = true; if( node->signatureState() != KMMsgNotSigned ) - if( KMessageBox::questionYesNo( tqparentWidget(), + if( KMessageBox::questionYesNo( parentWidget(), i18n( "The part %1 of the message is signed. Do you want to keep the signature when saving?" ). arg( url.fileName() ), i18n( "KMail Question" ), i18n("Keep Signature"), i18n("Do Not Keep") ) != @@ -2749,7 +2749,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, file.setName( url.path() ); if ( !file.open( IO_WriteOnly ) ) { - KMessageBox::error( tqparentWidget(), + KMessageBox::error( parentWidget(), i18n( "%2 is detailed error description", "Could not write the file %1:\n%2" ) .tqarg( file.name() ) @@ -2773,9 +2773,9 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, if ( !url.isLocalFile() ) { tf.close(); - if ( !KIO::NetAccess::upload( tf.name(), url, tqparentWidget() ) ) + if ( !KIO::NetAccess::upload( tf.name(), url, parentWidget() ) ) { - KMessageBox::error( tqparentWidget(), + KMessageBox::error( parentWidget(), i18n( "Could not write the file %1." ) .tqarg( url.path() ), i18n( "KMail Error" ) ); @@ -3015,7 +3015,7 @@ KMCommand::Result KMIMChatCommand::execute() apology = apology.tqarg( names ); } - KMessageBox::sorry( tqparentWidget(), apology ); + KMessageBox::sorry( parentWidget(), apology ); return Failed; } } @@ -3196,13 +3196,13 @@ void KMHandleAttachmentCommand::atmSave() parts.append( mNode ); // save, do not leave encoded KMSaveAttachmentsCommand *command = - new KMSaveAttachmentsCommand( tqparentWidget(), parts, mMsg, false ); + new KMSaveAttachmentsCommand( parentWidget(), parts, mMsg, false ); command->start(); } void KMHandleAttachmentCommand::atmProperties() { - KMMsgPartDialogCompat dlg( tqparentWidget() , 0, true ); + KMMsgPartDialogCompat dlg( parentWidget() , 0, true ); KMMessagePart& msgPart = mNode->msgPart(); dlg.setMsgPart( &msgPart ); dlg.exec(); @@ -3229,12 +3229,12 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() if ( !listjob.get() ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } if ( listjob->exec() ) { - listjob->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Backend Error" ) ); + listjob->showErrorDialog( parentWidget(), i18n( "Chiasmus Backend Error" ) ); return; } @@ -3243,7 +3243,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() const TQString msg = i18n( "Unexpected return value from Chiasmus backend: " "The \"x-obtain-keys\" function did not return a " "string list. Please report this bug." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } @@ -3252,11 +3252,11 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() const TQString msg = i18n( "No keys have been found. Please check that a " "valid key path has been set in the Chiasmus " "configuration." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } - ChiasmusKeySelector selectorDlg( tqparentWidget(), i18n( "Chiasmus Decryption Key Selection" ), + ChiasmusKeySelector selectorDlg( parentWidget(), i18n( "Chiasmus Decryption Key Selection" ), keys, GlobalSettings::chiasmusDecryptionKey(), GlobalSettings::chiasmusDecryptionOptions() ); if ( selectorDlg.exec() != TQDialog::Accepted ) @@ -3270,7 +3270,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() if ( !job ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-decrypt\" function. Please report this bug." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } @@ -3281,13 +3281,13 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() !job->setProperty( "input", input ) ) { const TQString msg = i18n( "The \"x-decrypt\" function does not accept " "the expected parameters. Please report this bug." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } setDeletesItself( true ); // the job below is async, we have to cleanup ourselves if ( job->start() ) { - job->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Decryption Error" ) ); + job->showErrorDialog( parentWidget(), i18n( "Chiasmus Decryption Error" ) ); return; } @@ -3313,7 +3313,7 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E if ( err.isCanceled() ) return; if ( err ) { - job->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Decryption Error" ) ); + job->showErrorDialog( parentWidget(), i18n( "Chiasmus Decryption Error" ) ); return; } @@ -3321,21 +3321,21 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E const TQString msg = i18n( "Unexpected return value from Chiasmus backend: " "The \"x-decrypt\" function did not return a " "byte array. Please report this bug." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } - const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString(), tqparentWidget() ); + const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString(), parentWidget() ); if ( url.isEmpty() ) return; - bool overwrite = KMail::Util::checkOverwrite( url, tqparentWidget() ); + bool overwrite = KMail::Util::checkOverwrite( url, parentWidget() ); if ( !overwrite ) return; d.setDisabled( true ); // we got this far, don't delete yet KIO::Job * uploadJob = KIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ ); - uploadJob->setWindow( tqparentWidget() ); + uploadJob->setWindow( parentWidget() ); connect( uploadJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(KIO::Job*)) ); } @@ -3500,7 +3500,7 @@ KMCommand::Result KMEditAttachmentCommand::doAttachmentModify() KMail::EditorWatcher *watcher = new KMail::EditorWatcher( KURL( mTempFile.file()->name() ), part.typeStr() + "/" + part.subtypeStr(), - false, this, tqparentWidget() ); + false, this, parentWidget() ); connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(editDone(KMail::EditorWatcher*)) ); if ( !watcher->start() ) return Failed; @@ -3529,16 +3529,16 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher) DwBodyPart *dwpart = msg->findPart( mPartIndex ); KMMessage::bodyPart( dwpart, &part, true ); - DwBody *tqparentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); - assert( tqparentNode ); - tqparentNode->RemoveBodyPart( dwpart ); + DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); + assert( parentNode ); + parentNode->RemoveBodyPart( dwpart ); KMMessagePart att; att.duplicate( part ); att.setBodyEncodedBinary( data ); DwBodyPart* newDwPart = msg->createDWBodyPart( &att ); - tqparentNode->AddBodyPart( newDwPart ); + parentNode->AddBodyPart( newDwPart ); msg->getTopLevelPart()->Assemble(); KMMessage *newMsg = new KMMessage(); diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 173f98ee6..8ebe68b15 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -99,7 +99,7 @@ protected: // Returns the single message retrieved KMMessage *retrievedMessage() const; // Returns the tqparent widget - TQWidget *tqparentWidget() const; + TQWidget *parentWidget() const; bool deletesItself() { return mDeletesItself; } /** Specify whether the subclass takes care of the deletion of the object. diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 42d55dcda..c12ff0629 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -1685,7 +1685,7 @@ void KMComposeWin::setupEditor(void) connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) ); connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( tqalignmentChanged( int ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( alignmentChanged( int ) ) ); } @@ -2010,7 +2010,7 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, mEditor->setText( otp.textualContent() ); mCharset = otp.textualContentCharset(); if ( partNode * n = root->findType( DwMime::kTypeText, DwMime::kSubtypeHtml ) ) - if ( partNode * p = n->tqparentNode() ) + if ( partNode * p = n->parentNode() ) if ( p->hasType( DwMime::kTypeMultipart ) && p->hasSubType( DwMime::kSubtypeAlternative ) ) if ( mMsg->headerField( "X-KMail-Markup" ) == "true" ) { @@ -2068,9 +2068,9 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, partNode *root = partNode::fromMessage( mMsg ); partNode *node = root->findType( DwMime::kTypeText, DwMime::kSubtypeHtml ); - if ( node && node->tqparentNode() && - node->tqparentNode()->hasType( DwMime::kTypeMultipart ) && - node->tqparentNode()->hasSubType( DwMime::kSubtypeAlternative ) ) { + if ( node && node->parentNode() && + node->parentNode()->hasType( DwMime::kTypeMultipart ) && + node->parentNode()->hasSubType( DwMime::kSubtypeAlternative ) ) { // we have a mp/al body part with a text and an html body kdDebug(5006) << "KMComposeWin::setMsg() : text/html found" << endl; firstAttachment = 2; @@ -5252,7 +5252,7 @@ void KMComposeWin::fontChanged( const TQFont &f ) fontSizeAction->setFontSize( f.pointSize() ); } -void KMComposeWin::tqalignmentChanged( int a ) +void KMComposeWin::alignmentChanged( int a ) { //toggleMarkup(); alignLeftAction->setChecked( ( a == AlignAuto ) || ( a & AlignLeft ) ); diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index b76aa9113..874789b2d 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -503,7 +503,7 @@ private slots: void slotFormatReset(); void slotTextColor(); void fontChanged( const TQFont & ); - void tqalignmentChanged( int ); + void alignmentChanged( int ); public: // kmkernel, attachmentlistview bool addAttach(const KURL url); diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 5c45528eb..ceef636e6 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -524,7 +524,7 @@ KMFilterAction::ReturnCode KMFilterActionWithCommand::genericProcess(KMMessage* if ( commandLine.isEmpty() ) return ErrorButGoOn; - // The tqparentheses force the creation of a subshell + // The parentheses force the creation of a subshell // in which the user-specified command is executed. // This is to really catch all output of the command as well // as to avoid clashes of our redirection with the ones @@ -1800,7 +1800,7 @@ void KMFilterActionExtFilter::processAsync(KMMessage* aMsg) const if ( commandLine.isEmpty() ) handler->actionMessage( ErrorButGoOn ); - // The tqparentheses force the creation of a subshell + // The parentheses force the creation of a subshell // in which the user-specified command is executed. // This is to really catch all output of the command as well // as to avoid clashes of our redirection with the ones diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index a1b53aee7..e8fa8a3d5 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -95,7 +95,7 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, tqparent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), tqparent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); - connect( mStorage, TQT_SIGNAL( tqinvalidated( KMFolder* ) ), + connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ), tqparent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); } @@ -592,11 +592,11 @@ TQString KMFolder::label() const //----------------------------------------------------------------------------- TQString KMFolder::prettyURL() const { - TQString tqparentUrl; + TQString parentUrl; if ( tqparent() ) - tqparentUrl = tqparent()->prettyURL(); - if ( !tqparentUrl.isEmpty() ) - return tqparentUrl + '/' + label(); + parentUrl = tqparent()->prettyURL(); + if ( !parentUrl.isEmpty() ) + return parentUrl + '/' + label(); else return label(); } @@ -890,7 +890,7 @@ void KMFolder::slotContentsTypeChanged( KMail::FolderContentsType type ) void KMFolder::slotFolderSizeChanged() { emit folderSizeChanged( this ); - KMFolder* papa = tqparent()->manager()->tqparentFolder( this ); + KMFolder* papa = tqparent()->manager()->parentFolder( this ); if ( papa && papa != this ) { papa->slotFolderSizeChanged(); } diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index a774e11e0..de9f4e007 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -744,7 +744,7 @@ void KMFolderCachedImap::slotTroubleshoot() TQString s2 = i18n("&Refresh"); if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) == KMessageBox::Continue ) - account()->tqinvalidateIMAPFolders( this ); + account()->invalidateIMAPFolders( this ); } else { // Rebuild index file switch ( rc ) { @@ -2746,7 +2746,7 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr && GlobalSettings::self()->theIMAPResourceEnabled() && subtype == "default" ) { // Truncate subtype if this folder can't be a default resource folder for us, - // although it aptqparently is for someone else. + // although it apparently is for someone else. mAnnotationFolderType = type; kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: tqparent folder is " << folder()->tqparent()->owner()->idString() << " => truncating annotation to " << value << endl; } diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 9d514614f..a7ebe5c1d 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -272,8 +272,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, // Determine if we are allowed to rename this folder. Only possible if the folder supports // ACLs. bool nameChangeAllowed = true; - if ( mDlg->folder() && mDlg->tqparentFolder() && - mDlg->folder()->storage() && mDlg->tqparentFolder()->storage() && + if ( mDlg->folder() && mDlg->parentFolder() && + mDlg->folder()->storage() && mDlg->parentFolder()->storage() && ( mDlg->folder()->folderType() == KMFolderTypeCachedImap || mDlg->folder()->folderType() == KMFolderTypeImap ) ) { ImapAccountBase *account = 0; @@ -289,31 +289,31 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, } if ( account && account->hasACLSupport() ) { - int tqparentRights = -1; + int parentRights = -1; int folderRights = -1; - bool tqparentRightsOk = false; + bool parentRightsOk = false; bool folderRightsOk = false; if ( imap ) { - KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ); + KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ); folderRights = imap->userRights(); folderRightsOk = imap->userRightsState() == KMail::ACLJobs::Ok; if ( tqparent ) { - tqparentRights = tqparent->userRights(); - tqparentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; + parentRights = tqparent->userRights(); + parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; } } else if ( dimap ) { - KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->tqparentFolder()->storage() ); + KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() ); folderRights = dimap->userRights(); folderRightsOk = dimap->userRightsState() == KMail::ACLJobs::Ok; if ( tqparent ) { - tqparentRights = tqparent->userRights(); - tqparentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; + parentRights = tqparent->userRights(); + parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; } } // For renaming, we need support for deleting the mailbox and then re-creating it. - if ( tqparentRightsOk && folderRightsOk && - ( !( tqparentRights & KMail::ACLJobs::Create ) || !( folderRights & KMail::ACLJobs::Delete ) ) ) { + if ( parentRightsOk && folderRightsOk && + ( !( parentRights & KMail::ACLJobs::Create ) || !( folderRights & KMail::ACLJobs::Delete ) ) ) { nameChangeAllowed = false; } } @@ -702,9 +702,9 @@ bool FolderDiaGeneralTab::save() else fldName = oldFldName; - if ( mDlg->tqparentFolder() && - mDlg->tqparentFolder()->folderType() != KMFolderTypeImap && - mDlg->tqparentFolder()->folderType() != KMFolderTypeCachedImap ) + if ( mDlg->parentFolder() && + mDlg->parentFolder()->folderType() != KMFolderTypeImap && + mDlg->parentFolder()->folderType() != KMFolderTypeCachedImap ) fldName.remove('/'); fldName.remove(TQRegExp("^\\.*")); if (fldName.isEmpty()) fldName = i18n("unnamed"); diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h index a97d78b33..56436ecef 100644 --- a/kmail/kmfolderdia.h +++ b/kmail/kmfolderdia.h @@ -215,7 +215,7 @@ public: KMFolderDir* folderDir() const { return mFolderDir; } typedef TQValueList<TQGuardedPtr<KMFolder> > FolderList; - KMFolder* tqparentFolder() const { return mParentFolder; } + KMFolder* parentFolder() const { return mParentFolder; } KMFolderTree* folderTree() const { return mFolderTree; } diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index f6edcaf1b..32eb58343 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -154,22 +154,22 @@ TQString KMFolderDir::label() const //----------------------------------------------------------------------------- TQString KMFolderDir::prettyURL() const { - TQString tqparentUrl; + TQString parentUrl; if ( tqparent() ) - tqparentUrl = tqparent()->prettyURL(); - if ( !tqparentUrl.isEmpty() ) - return tqparentUrl + '/' + label(); + parentUrl = tqparent()->prettyURL(); + if ( !parentUrl.isEmpty() ) + return parentUrl + '/' + label(); else return label(); } //----------------------------------------------------------------------------- -void KMFolderDir::addDirToParent( const TQString &dirName, KMFolder *tqparentFolder ) +void KMFolderDir::addDirToParent( const TQString &dirName, KMFolder *parentFolder ) { - KMFolderDir* folderDir = new KMFolderDir( tqparentFolder, this, dirName, mDirType); + KMFolderDir* folderDir = new KMFolderDir( parentFolder, this, dirName, mDirType); folderDir->reload(); append( folderDir ); - tqparentFolder->setChild( folderDir ); + parentFolder->setChild( folderDir ); } // Get the default folder type of the given dir type. This function should only be used when diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index 3df289bcc..b78e82e8e 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -28,7 +28,7 @@ public: /** * Adds the given subdirectory of this directory to the associated folder. */ - void addDirToParent( const TQString &dirName, KMFolder *tqparentFolder ); + void addDirToParent( const TQString &dirName, KMFolder *parentFolder ); /** Read contents of directory. */ virtual bool reload(); diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index 38e025bc4..303b7b01f 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -153,19 +153,19 @@ KMMessage* KMFolderImap::getMsg(int idx) KMAcctImap* KMFolderImap::account() const { if ( !mAccount ) { - KMFolderDir *tqparentFolderDir = dynamic_cast<KMFolderDir*>( folder()->tqparent() ); - if ( !tqparentFolderDir ) { + KMFolderDir *parentFolderDir = dynamic_cast<KMFolderDir*>( folder()->tqparent() ); + if ( !parentFolderDir ) { kdWarning() << k_funcinfo << "No tqparent folder dir found for " << name() << endl; return 0; } - KMFolder *tqparentFolder = tqparentFolderDir->owner(); - if ( !tqparentFolder ) { + KMFolder *parentFolder = parentFolderDir->owner(); + if ( !parentFolder ) { kdWarning() << k_funcinfo << "No tqparent folder found for " << name() << endl; return 0; } - KMFolderImap *tqparentStorage = dynamic_cast<KMFolderImap*>( tqparentFolder->storage() ); - if ( tqparentStorage ) - mAccount = tqparentStorage->account(); + KMFolderImap *parentStorage = dynamic_cast<KMFolderImap*>( parentFolder->storage() ); + if ( parentStorage ) + mAccount = parentStorage->account(); } return mAccount; } @@ -1718,17 +1718,17 @@ void KMFolderImap::slotGetMessagesResult(KIO::Job * job) //----------------------------------------------------------------------------- -void KMFolderImap::createFolder(const TQString &name, const TQString& tqparentPath, +void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath, bool askUser) { kdDebug(5006) << "KMFolderImap::createFolder - name=" << name << ",tqparent=" << - tqparentPath << ",askUser=" << askUser << endl; + parentPath << ",askUser=" << askUser << endl; if ( account()->makeConnection() != ImapAccountBase::Connected ) { kdWarning(5006) << "KMFolderImap::createFolder - got no connection" << endl; return; } KURL url = account()->getUrl(); - TQString tqparent = ( tqparentPath.isEmpty() ? imapPath() : tqparentPath ); + TQString tqparent = ( parentPath.isEmpty() ? imapPath() : parentPath ); TQString path = account()->createImapPath( tqparent, name ); if ( askUser ) { path += "/;INFO=ASKUSER"; diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index b08508955..e8ef5e7b6 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -113,7 +113,7 @@ protected: /** Inserts messages into the message dictionary by iterating over the * message list. The messages will get new serial numbers. This is only * used on newly appeared folders, where there is no .ids file yet, or - * when that has been tqinvalidated. */ + * when that has been invalidated. */ virtual void fillMessageDict(); /** table of contents file */ diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 684af395d..fe19131fb 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -899,7 +899,7 @@ int KMFolderMaildir::createIndexFromContents() needsCompact = true; - tqinvalidateFolder(); + invalidateFolder(); return 0; } diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index 504b5c5ae..75a584551 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -809,7 +809,7 @@ int KMFolderMbox::createIndexFromContents() "most-likely not created by KMail;\nplease remove them from there if you " "do not want KMail to send them.")); - tqinvalidateFolder(); + invalidateFolder(); return 0; } diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index a37f9136d..383f562ac 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -366,20 +366,20 @@ void KMFolderMgr::removeFolder(KMFolder* aFolder) aFolder->remove(); } -KMFolder* KMFolderMgr::tqparentFolder( KMFolder* folder ) +KMFolder* KMFolderMgr::parentFolder( KMFolder* folder ) { // find the tqparent folder by stripping "." and ".directory" from the name KMFolderDir* fdir = folder->tqparent(); - TQString tqparentName = fdir->name(); - tqparentName = tqparentName.mid( 1, tqparentName.length()-11 ); - KMFolderNode* tqparent = fdir->hasNamedFolder( tqparentName ); + TQString parentName = fdir->name(); + parentName = parentName.mid( 1, parentName.length()-11 ); + KMFolderNode* tqparent = fdir->hasNamedFolder( parentName ); if ( !tqparent && fdir->tqparent() ) // dimap obviously has a different structure - tqparent = fdir->tqparent()->hasNamedFolder( tqparentName ); + tqparent = fdir->tqparent()->hasNamedFolder( parentName ); - KMFolder* tqparentF = 0; + KMFolder* parentF = 0; if ( tqparent ) - tqparentF = dynamic_cast<KMFolder*>( tqparent ); - return tqparentF; + parentF = dynamic_cast<KMFolder*>( tqparent ); + return parentF; } void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) @@ -397,17 +397,17 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) break; } } - KMFolder* tqparentF = tqparentFolder( aFolder ); + KMFolder* parentF = parentFolder( aFolder ); // aFolder will be deleted by the next call! aFolder->tqparent()->remove(aFolder); // update the tqchildren state - if ( tqparentF ) + if ( parentF ) { - if ( tqparentF != aFolder ) + if ( parentF != aFolder ) { - tqparentF->storage()->updateChildrenState(); + parentF->storage()->updateChildrenState(); } } else diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h index 7e6e630db..0565157ad 100644 --- a/kmail/kmfoldermgr.h +++ b/kmail/kmfoldermgr.h @@ -123,7 +123,7 @@ public: void copyFolder( KMFolder* folder, KMFolderDir* newParent ); /** Returns the tqparent Folder for the given folder or 0 on failure. */ - KMFolder* tqparentFolder( KMFolder* folder ); + KMFolder* parentFolder( KMFolder* folder ); public slots: /** GUI action: compact all folders that need to be compacted */ @@ -151,7 +151,7 @@ signals: /** Emitted, when a folder has been added. */ void folderAdded(KMFolder*); - /** Emitted, when serial numbers for a folder have been tqinvalidated. */ + /** Emitted, when serial numbers for a folder have been invalidated. */ void folderInvalidated(KMFolder*); /** Emitted, when a message has been appended to a folder */ diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index fa36bde51..e7fd1d269 100644 --- a/kmail/kmfoldersearch.cpp +++ b/kmail/kmfoldersearch.cpp @@ -423,7 +423,7 @@ void KMFolderSearch::executeSearch() if (mSearch) mSearch->stop(); setSearch(mSearch); - tqinvalidateFolder(); + invalidateFolder(); } const KMSearch* KMFolderSearch::search() const diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h index a3a1bc928..88e34994f 100644 --- a/kmail/kmfoldersearch.h +++ b/kmail/kmfoldersearch.h @@ -147,7 +147,7 @@ protected slots: void examineRemovedMessage(KMFolder *folder, TQ_UINT32 serNum); // Look at a message whose status has changed void examineChangedMessage(KMFolder *folder, TQ_UINT32 serNum, int delta); - // The serial numbers for a folder have been tqinvalidated, deal with it + // The serial numbers for a folder have been invalidated, deal with it void examineInvalidatedFolder(KMFolder *folder); // A folder has been deleted, deal with it void examineRemovedFolder(KMFolder *folder); diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index c8bde2b63..32f6e3c44 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -1587,7 +1587,7 @@ void KMFolderTree::slotFolderExpanded( TQListViewItem * item ) return; if ( folder->getSubfolderState() == KMFolderImap::imapNoInformation ) { - // check if all tqparents are expanded + // check if all parents are expanded TQListViewItem *tqparent = item->tqparent(); while ( tqparent ) { @@ -2043,15 +2043,15 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source // check if the source folders are independent of each other for ( TQValueList<TQGuardedPtr<KMFolder> >::ConstIterator it = sources.constBegin(); move && it != sources.constEnd(); ++it ) { - KMFolderDir *tqparentDir = (*it)->child(); - if ( !tqparentDir ) + KMFolderDir *parentDir = (*it)->child(); + if ( !parentDir ) continue; for ( TQValueList<TQGuardedPtr<KMFolder> >::ConstIterator it2 = sources.constBegin(); it2 != sources.constEnd(); ++it2 ) { if ( *it == *it2 ) continue; KMFolderDir *childDir = (*it2)->tqparent(); do { - if ( tqparentDir == childDir || tqparentDir->tqfindRef( childDir->owner() ) != -1 ) { + if ( parentDir == childDir || parentDir->tqfindRef( childDir->owner() ) != -1 ) { KMessageBox::error( this, i18n("Moving the selected folders is not possible") ); setDragEnabled( true ); return; diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index f13425eb0..f8e8fff8f 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -953,7 +953,7 @@ void KMHeaders::msgAdded(int id) if ( !msgId.isEmpty() ) mSortCacheItems.tqreplace(msgId, sci); - /* Add to the list of potential tqparents for subject threading. But only if + /* Add to the list of potential parents for subject threading. But only if * we are top level. */ if (mSubjThreading && tqparent) { TQString subjMD5 = mFolder->getMsgBase(id)->strippedSubjectMD5(); @@ -1110,7 +1110,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) if (mSortCacheItems[msgId] == removedItem->sortCacheItem()) mSortCacheItems.remove(msgId); } - // Remove the message from the list of potential tqparents for threading by + // Remove the message from the list of potential parents for threading by // subject. if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() ) removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() ); @@ -2660,19 +2660,19 @@ void KMHeaders::setSorting( int column, bool ascending ) //Flatten the list and write it to disk static void internalWriteItem(FILE *sortStream, KMFolder *folder, int msgid, - int tqparent_id, TQString key, + int parent_id, TQString key, bool update_discover=true) { unsigned long msgSerNum; - unsigned long tqparentSerNum; + unsigned long parentSerNum; msgSerNum = KMMsgDict::instance()->getMsgSerNum( folder, msgid ); - if (tqparent_id >= 0) - tqparentSerNum = KMMsgDict::instance()->getMsgSerNum( folder, tqparent_id ) + KMAIL_RESERVED; + if (parent_id >= 0) + parentSerNum = KMMsgDict::instance()->getMsgSerNum( folder, parent_id ) + KMAIL_RESERVED; else - tqparentSerNum = (unsigned long)(tqparent_id + KMAIL_RESERVED); + parentSerNum = (unsigned long)(parent_id + KMAIL_RESERVED); fwrite(&msgSerNum, sizeof(msgSerNum), 1, sortStream); - fwrite(&tqparentSerNum, sizeof(tqparentSerNum), 1, sortStream); + fwrite(&parentSerNum, sizeof(parentSerNum), 1, sortStream); TQ_INT32 len = key.length() * sizeof(TQChar); fwrite(&len, sizeof(len), 1, sortStream); if (len) @@ -2768,7 +2768,7 @@ bool KMHeaders::writeSortOrder() KMMsgBase *kmb; while(HeaderItem *i = items.pop()) { - int tqparent_id = -1; //no tqparent, top level + int parent_id = -1; //no tqparent, top level if (threaded) { kmb = mFolder->getMsgBase( i->msgId() ); assert(kmb); // I have seen 0L come out of this, called from @@ -2781,7 +2781,7 @@ bool KMHeaders::writeSortOrder() p = mSortCacheItems[replymd5]; if (p) - tqparent_id = p->id(); + parent_id = p->id(); // We now have either found a tqparent, or set it to -1, which means that // it will be reevaluated when a message is added, for example. If there // is no replyToId and no replyToAuxId and the message is not prefixed, @@ -2790,12 +2790,12 @@ bool KMHeaders::writeSortOrder() if (replymd5.isEmpty() && replyToAuxId.isEmpty() && !kmb->subjectIsPrefixed() ) - tqparent_id = -2; + parent_id = -2; // FIXME also mark messages with -1 as -2 a certain amount of time after // their arrival, since it becomes very unlikely that a new tqparent for // them will show up. (Ingo suggests a month.) -till } - internalWriteItem(sortStream, mFolder, i->msgId(), tqparent_id, + internalWriteItem(sortStream, mFolder, i->msgId(), parent_id, i->key(mSortCol, !mSortDescending), false); //double check for magic headers sorted_count++; @@ -2828,20 +2828,20 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) { TQString sortFile = KMAIL_SORT_FILE(mFolder); if(FILE *sortStream = fopen(TQFile::encodeName(sortFile), "r+")) { - int tqparent_id = -1; //no tqparent, top level + int parent_id = -1; //no tqparent, top level if (isThreaded()) { SortCacheItem *sci = khi->sortCacheItem(); KMMsgBase *kmb = mFolder->getMsgBase( khi->msgId() ); if(sci->tqparent() && !sci->isImperfectlyThreaded()) - tqparent_id = sci->tqparent()->id(); + parent_id = sci->tqparent()->id(); else if(kmb->replyToIdMD5().isEmpty() && kmb->replyToAuxIdMD5().isEmpty() && !kmb->subjectIsPrefixed()) - tqparent_id = -2; + parent_id = -2; } - internalWriteItem(sortStream, mFolder, khi->msgId(), tqparent_id, + internalWriteItem(sortStream, mFolder, khi->msgId(), parent_id, khi->key(mSortCol, !mSortDescending), false); //update the appended flag FIXME obsolete? @@ -2881,12 +2881,12 @@ void SortCacheItem::updateSortFile( FILE *sortStream, KMFolder *folder, fseek(sortStream, mSortOffset, SEEK_SET); } - int tqparent_id = -1; + int parent_id = -1; if(!waiting_for_tqparent) { if(mParent && !isImperfectlyThreaded()) - tqparent_id = mParent->id(); + parent_id = mParent->id(); } - internalWriteItem(sortStream, folder, mId, tqparent_id, mKey, update_discover); + internalWriteItem(sortStream, folder, mId, parent_id, mKey, update_discover); } static bool compare_ascending = false; @@ -2931,8 +2931,8 @@ void KMHeaders::printThreadingTree() } for (int i = 0; i < (int)mItems.size(); ++i) { HeaderItem *item = mItems[i]; - int tqparentCacheId = item->sortCacheItem()->tqparent()?item->sortCacheItem()->tqparent()->id():0; - kdDebug( 5006 ) << "SortCacheItem: " << item->sortCacheItem()->id() << " tqparent: " << tqparentCacheId << endl; + int parentCacheId = item->sortCacheItem()->tqparent()?item->sortCacheItem()->tqparent()->id():0; + kdDebug( 5006 ) << "SortCacheItem: " << item->sortCacheItem()->id() << " tqparent: " << parentCacheId << endl; kdDebug( 5006 ) << "Item: " << item << " sortCache: " << item->sortCacheItem() << " tqparent: " << item->sortCacheItem()->tqparent() << endl; } kdDebug(5006) << endl; @@ -3038,7 +3038,7 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) TQString replyToIdMD5 = msg->replyToIdMD5(); TQString subjMD5 = msg->strippedSubjectMD5(); if (!subjMD5.isEmpty() && mSubjectLists[subjMD5]) { - /* Iterate over the list of potential tqparents with the same + /* Iterate over the list of potential parents with the same * subject, and take the closest one by date. */ for (TQPtrListIterator<SortCacheItem> it2(*mSubjectLists[subjMD5]); it2.current(); ++it2) { @@ -3050,7 +3050,7 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) // delta == 0 is not allowed, to avoid circular threading // with duplicates. if (delta > 0 ) { - // Don't use tqparents more than 6 weeks older than us. + // Don't use parents more than 6 weeks older than us. if (delta < 3628899) tqparent = (*it2); break; @@ -3077,7 +3077,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) bool error = false; //threaded cases - TQPtrList<SortCacheItem> untqparented; + TQPtrList<SortCacheItem> unparented; mImperfectlyThreadedList.clear(); //cleanup @@ -3117,7 +3117,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) mSortInfo.ascending = (compare_ascending = ascending); SortCacheItem *item; - unsigned long serNum, tqparentSerNum; + unsigned long serNum, parentSerNum; int id, len, tqparent, x; TQChar *tmp_qchar = 0; int tmp_qchar_len = 0; @@ -3131,7 +3131,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) KMFolder *folder; //parse if(!fread(&serNum, sizeof(serNum), 1, sortStream) || //short read means to end - !fread(&tqparentSerNum, sizeof(tqparentSerNum), 1, sortStream) || + !fread(&parentSerNum, sizeof(parentSerNum), 1, sortStream) || !fread(&len, sizeof(len), 1, sortStream)) { break; } @@ -3157,10 +3157,10 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) ++deleted_count; continue; } - if (tqparentSerNum < KMAIL_RESERVED) { - tqparent = (int)tqparentSerNum - KMAIL_RESERVED; + if (parentSerNum < KMAIL_RESERVED) { + tqparent = (int)parentSerNum - KMAIL_RESERVED; } else { - KMMsgDict::instance()->getLocation(tqparentSerNum - KMAIL_RESERVED, &folder, &tqparent); + KMMsgDict::instance()->getLocation(parentSerNum - KMAIL_RESERVED, &folder, &tqparent); if (folder != mFolder) tqparent = -1; } @@ -3185,7 +3185,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) } if (threaded && tqparent != -2) { if(tqparent == -1) { - untqparented.append(item); + unparented.append(item); mRoot->addUnsortedChild(item); } else { if( ! sortCache[tqparent] ) { @@ -3245,7 +3245,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) sortCache[x] = new SortCacheItem( x, HeaderItem::generate_key( this, msg, &mPaintInfo, sortOrder )); if(threaded) - untqparented.append(sortCache[x]); + unparented.append(sortCache[x]); else mRoot->addUnsortedChild(sortCache[x]); if(sortStream) @@ -3263,11 +3263,11 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) if (threaded) buildThreadingTree( sortCache ); TQPtrList<SortCacheItem> toBeSubjThreaded; - if (threaded && !untqparented.isEmpty()) { + if (threaded && !unparented.isEmpty()) { CREATE_TIMER(reparent); START_TIMER(reparent); - for(TQPtrListIterator<SortCacheItem> it(untqparented); it.current(); ++it) { + for(TQPtrListIterator<SortCacheItem> it(unparented); it.current(); ++it) { SortCacheItem *item = (*it); SortCacheItem *tqparent = findParent( item ); // If we have a tqparent, make sure it's not ourselves @@ -3515,7 +3515,7 @@ void KMHeaders::setCurrentItemBySerialNum( unsigned long serialNum ) { // Linear search == slow. Don't overuse this method. // It's currently only used for finding the current item again - // after expiry deleted mails (so the index got tqinvalidated). + // after expiry deleted mails (so the index got invalidated). for (int i = 0; i < (int)mItems.size() - 1; ++i) { KMMsgBase *mMsgBase = mFolder->getMsgBase( i ); if ( mMsgBase->getMsgSerNum() == serialNum ) { diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 9754f95a3..931d15ea7 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -214,7 +214,7 @@ bool KMKernel::handleCommandLine( bool noArgsOpensReader ) // that the user wants to send a message with subject "ession" but // (most likely) that the user clicked on KMail's system tray applet // which results in KMKernel::raise() calling "kmail kmail newInstance" - // via dcop which aptqparently executes the application with the original + // via dcop which apparently executes the application with the original // command line arguments and those include "-session ..." if // kmail/kontact was restored by session management if ( subj == "ession" ) { diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 86acaef78..e43f8cceb 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -119,7 +119,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) else { KABC::VCardConverter converter; TQString fileName; - if ( KIO::NetAccess::download( (*it), fileName, tqparentWidget() ) ) { + if ( KIO::NetAccess::download( (*it), fileName, parentWidget() ) ) { TQFile file( fileName ); file.open( IO_ReadOnly ); const TQByteArray data = file.readAll(); @@ -133,7 +133,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) } else { TQString caption( i18n( "vCard Import Failed" ) ); TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).tqarg( (*it).url() ); - KMessageBox::error( tqparentWidget(), text, caption ); + KMessageBox::error( parentWidget(), text, caption ); } } // Now, let the user choose which addressee to add. diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 89c50fd32..fd41d4a89 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -351,13 +351,13 @@ void KMMainWidget::readConfig(void) readPreConfig(); mHeaders->refreshNestedState(); - bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList ) + bool layoutChanged = ( oldLongFolderList != mLongFolderList ) || ( oldReaderWindowActive != mReaderWindowActive ) || ( oldReaderWindowBelow != mReaderWindowBelow ) || ( oldFavoriteFolderView != mEnableFavoriteFolderView ); - if( tqlayoutChanged ) { + if( layoutChanged ) { hide(); // delete all panners delete mPanner1; // will always delete the others @@ -389,11 +389,11 @@ void KMMainWidget::readConfig(void) widths << folderW << headerW; heights << headerH << readerH; - bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList ) + bool layoutChanged = ( oldLongFolderList != mLongFolderList ) || ( oldReaderWindowActive != mReaderWindowActive ) || ( oldReaderWindowBelow != mReaderWindowBelow ); - if (!mStartupDone || tqlayoutChanged ) + if (!mStartupDone || layoutChanged ) { /** unread / total columns * as we have some dependencies in this widget @@ -482,11 +482,11 @@ void KMMainWidget::readConfig(void) // Update systray toggleSystemTray(); - bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList ) + bool layoutChanged = ( oldLongFolderList != mLongFolderList ) || ( oldReaderWindowActive != mReaderWindowActive ) || ( oldReaderWindowBelow != mReaderWindowBelow ) || ( oldFavoriteFolderView != mEnableFavoriteFolderView ); - if ( tqlayoutChanged ) { + if ( layoutChanged ) { activatePanners(); } @@ -1314,7 +1314,7 @@ void KMMainWidget::slotInvalidateIMAPFolders() { "This will remove all changes that you have done " "locally to your IMAP folders."), i18n("Refresh IMAP Cache"), i18n("&Refresh") ) == KMessageBox::Continue ) - kmkernel->acctMgr()->tqinvalidateIMAPFolders(); + kmkernel->acctMgr()->invalidateIMAPFolders(); } //----------------------------------------------------------------------------- @@ -2659,7 +2659,7 @@ void KMMainWidget::setupActions() (void) new KAction( i18n("&Refresh Local IMAP Cache"), "refresh", TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()), - actionCollection(), "file_tqinvalidate_imap_cache" ); + actionCollection(), "file_invalidate_imap_cache" ); (void) new KAction( i18n("Empty All &Trash Folders"), 0, KMKernel::self(), TQT_SLOT(slotEmptyTrash()), @@ -3339,8 +3339,8 @@ void KMMainWidget::updateMessageActions() } TQListViewItem *curItemParent = mHeaders->currentItem(); - bool tqparent_thread = 0; - if ( curItemParent && curItemParent->firstChild() != 0 ) tqparent_thread = 1; + bool parent_thread = 0; + if ( curItemParent && curItemParent->firstChild() != 0 ) parent_thread = 1; bool mass_actions = count >= 1; bool thread_actions = mass_actions && allSelectedInCommonThread && @@ -3376,7 +3376,7 @@ void KMMainWidget::updateMessageActions() mFindInMessageAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ) ); mForwardInlineAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder )); mForwardAttachedAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ) ); - mForwardDigestAction->setEnabled( ( count > 1 || tqparent_thread ) && !kmkernel->folderIsTemplates( mFolder ) ); + mForwardDigestAction->setEnabled( ( count > 1 || parent_thread ) && !kmkernel->folderIsTemplates( mFolder ) ); forwardMenu()->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder )); diff --git a/kmail/kmmainwin.rc b/kmail/kmmainwin.rc index 899d03c58..955dabad2 100644 --- a/kmail/kmmainwin.rc +++ b/kmail/kmmainwin.rc @@ -25,7 +25,7 @@ <Action name="file_print" /> <Separator/> <Action name="expire_all_folders" /> - <Action name="file_tqinvalidate_imap_cache"/> + <Action name="file_invalidate_imap_cache"/> <Action name="empty_trash"/> <Separator/> <Action name="online_status" /> diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index e44d253bb..c083638d3 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -3183,10 +3183,10 @@ bool KMMessage::deleteBodyPart( int partIndex ) if ( !part.isComplete() ) return false; - DwBody *tqparentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); - if ( !tqparentNode ) + DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); + if ( !parentNode ) return false; - tqparentNode->RemoveBodyPart( dwpart ); + parentNode->RemoveBodyPart( dwpart ); // add dummy part to show that a attachment has been deleted KMMessagePart dummyPart; @@ -3204,7 +3204,7 @@ bool KMMessage::deleteBodyPart( int partIndex ) dummyPart.setContentDisposition( "attachment" ); } DwBodyPart* newDwPart = createDWBodyPart( &dummyPart ); - tqparentNode->AddBodyPart( newDwPart ); + parentNode->AddBodyPart( newDwPart ); getTopLevelPart()->Assemble(); return true; } @@ -4306,10 +4306,10 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray & } else { // update body mLastUpdated->Body().FromString( content ); - TQString tqparentSpec = partSpecifier.section( '.', 0, -2 ); - if ( !tqparentSpec.isEmpty() ) + TQString parentSpec = partSpecifier.section( '.', 0, -2 ); + if ( !parentSpec.isEmpty() ) { - DwBodyPart* tqparent = findDwBodyPart( getFirstDwBodyPart(), tqparentSpec ); + DwBodyPart* tqparent = findDwBodyPart( getFirstDwBodyPart(), parentSpec ); if ( tqparent && tqparent->hasHeaders() && tqparent->Headers().HasContentType() ) { const DwMediaType& contentType = tqparent->Headers().ContentType(); diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 3c2e16ee0..b8937dc06 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -274,7 +274,7 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node, DwHeaders * headers( (part && part->hasHeaders()) ? &part->Headers() - : ( (weAreReplacingTheRootNode || !dataNode->tqparentNode()) + : ( (weAreReplacingTheRootNode || !dataNode->parentNode()) ? &rootHeaders : 0 ) ); if( dataNode == curNode ) { @@ -284,7 +284,7 @@ kdDebug(5006) << "dataNode == curNode: Save curNode without replacing it." << e // AND we are not replacing a node that already *has* replaced // the root node in previous recursion steps of this function... if( headers ) { - if( dataNode->tqparentNode() && !weAreReplacingTheRootNode ) { + if( dataNode->parentNode() && !weAreReplacingTheRootNode ) { kdDebug(5006) << "dataNode is NOT replacing the root node: Store the headers." << endl; resultingData += headers->AsString().c_str(); } else if( weAreReplacingTheRootNode && part && part->hasHeaders() ){ @@ -345,7 +345,7 @@ kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE } } else { kdDebug(5006) << "dataNode != curNode: Replace curNode by dataNode." << endl; - bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->tqparentNode(); + bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->parentNode(); if( rootNodeReplaceFlag ) { kdDebug(5006) << " Root node will be replaced." << endl; } else { diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index a066fc86e..9742d6278 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -211,7 +211,7 @@ void KMSystemTray::updateCount() // and which has a transparent background. // Unfortunately this required the following twisted code because for some // reason text that is drawn on a transparent pixmap is invisible - // (aptqparently the alpha channel isn't changed when the text is drawn). + // (apparently the alpha channel isn't changed when the text is drawn). // Therefore I have to draw the text on a solid background and then remove // the background by making it transparent with TQPixmap::setMask. This // involves the slow createHeuristicMask() function (from the API docs: diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index cb9c420ac..0b79d98c0 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -208,20 +208,20 @@ namespace KMail { myBody->Headers().Parse(); } - partNode* tqparentNode = &startNode; + partNode* parentNode = &startNode; partNode* newNode = new partNode(false, myBody); // Build the object tree of the new node before setting the tqparent, as otherwise - // buildObjectTree() would erronously modify the tqparents as well + // buildObjectTree() would erronously modify the parents as well newNode->buildObjectTree( false ); - if ( append && tqparentNode->firstChild() ) { - tqparentNode = tqparentNode->firstChild(); - while( tqparentNode->nextSibling() ) - tqparentNode = tqparentNode->nextSibling(); - tqparentNode->setNext( newNode ); + if ( append && parentNode->firstChild() ) { + parentNode = parentNode->firstChild(); + while( parentNode->nextSibling() ) + parentNode = parentNode->nextSibling(); + parentNode->setNext( newNode ); } else - tqparentNode->setFirstChild( newNode ); + parentNode->setFirstChild( newNode ); if ( startNode.mimePartTreeItem() ) { newNode->fillMimePartTree( startNode.mimePartTreeItem(), 0, @@ -260,7 +260,7 @@ namespace KMail { node->setProcessed( false, false ); if ( partNode * child = node->firstChild() ) child->setProcessed( false, true ); - } else if ( mReader && !node->tqparentNode() ) { + } else if ( mReader && !node->parentNode() ) { // ...this node and all it's siblings and descendants node->setProcessed( false, true ); } @@ -338,7 +338,7 @@ namespace KMail { const AttachmentStrategy * as = attachmentStrategy(); if ( as && as->defaultDisplay( node ) == AttachmentStrategy::None && !showOnlyOneMimePart() && - node->tqparentNode() /* message is not an attachment */ ) { + node->parentNode() /* message is not an attachment */ ) { node->setDisplayedHidden( true ); return; } @@ -1544,9 +1544,9 @@ namespace KMail { } const Kleo::CryptoBackend::Protocol* oldUseThisCryptPlug = cryptoProtocol(); - if ( node->tqparentNode() - && DwMime::kTypeMultipart == node->tqparentNode()->type() - && DwMime::kSubtypeEncrypted == node->tqparentNode()->subType() ) { + if ( node->parentNode() + && DwMime::kTypeMultipart == node->parentNode()->type() + && DwMime::kSubtypeEncrypted == node->parentNode()->subType() ) { //kdDebug(5006) << "\n-----> Initially processing encrypted data\n" << endl; node->setEncryptionState( KMMsgFullyEncrypted ); if ( keepEncryptions() ) { diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index de5e2d89e..352698252 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -236,8 +236,8 @@ TQCString partNode::subTypeString() const { const partNode* partNode::topLevelParent() const { const partNode *ret = this; - while ( ret->tqparentNode() ) - ret = ret->tqparentNode(); + while ( ret->parentNode() ) + ret = ret->parentNode(); return ret; } @@ -358,9 +358,9 @@ KMMsgSignatureState partNode::overallSignatureState() const TQCString partNode::path() const { - if ( !tqparentNode() ) + if ( !parentNode() ) return ':'; - const partNode * p = tqparentNode(); + const partNode * p = parentNode(); // count number of siblings with the same type as us: int nth = 0; @@ -463,7 +463,7 @@ partNode* partNode::findTypeNot( int type, int subType, bool deep, bool wide ) return 0; } -void partNode::fillMimePartTree( KMMimePartTreeItem* tqparentItem, +void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem, KMMimePartTree* mimePartTree, TQString labelDescr, TQString labelCntType, @@ -471,10 +471,10 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* tqparentItem, KIO::filesize_t size, bool revertOrder ) { - if( tqparentItem || mimePartTree ) { + if( parentItem || mimePartTree ) { if( mNext ) - mNext->fillMimePartTree( tqparentItem, mimePartTree, + mNext->fillMimePartTree( parentItem, mimePartTree, TQString(), TQString(), TQString(), 0, revertOrder ); @@ -518,8 +518,8 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* tqparentItem, // remove linebreak+whitespace from folded Content-Description cntDesc.tqreplace( TQRegExp("\\n\\s*"), " " ); - if( tqparentItem ) - mMimePartTreeItem = new KMMimePartTreeItem( tqparentItem, + if( parentItem ) + mMimePartTreeItem = new KMMimePartTreeItem( parentItem, this, cntDesc, cntType, @@ -595,7 +595,7 @@ partNode * partNode::next( bool allowChildren ) const { return c; if ( partNode * s = nextSibling() ) return s; - for ( partNode * p = tqparentNode() ; p ; p = p->tqparentNode() ) + for ( partNode * p = parentNode() ; p ; p = p->parentNode() ) if ( partNode * s = p->nextSibling() ) return s; return 0; @@ -607,7 +607,7 @@ bool partNode::isFirstTextPart() const { const partNode * root = this; // go up until we reach the root node of a message (of the actual message or // of an attached message) - while ( const partNode * p = root->tqparentNode() ) { + while ( const partNode * p = root->parentNode() ) { if ( p->type() == DwMime::kTypeMessage ) break; else @@ -652,11 +652,11 @@ bool partNode::isInEncapsulatedMessage() const const partNode * const topLevel = topLevelParent(); const partNode *cur = this; while ( cur && cur != topLevel ) { - const bool tqparentIsMessage = cur->tqparentNode() && - cur->tqparentNode()->msgPart().typeStr().lower() == "message"; - if ( tqparentIsMessage && cur->tqparentNode() != topLevel ) + const bool parentIsMessage = cur->parentNode() && + cur->parentNode()->msgPart().typeStr().lower() == "message"; + if ( parentIsMessage && cur->parentNode() != topLevel ) return true; - cur = cur->tqparentNode(); + cur = cur->parentNode(); } return false; } @@ -768,8 +768,8 @@ partNode::AttachmentDisplayInfo partNode::attachmentDisplayInfo() const typeBlacklisted = typeBlacklisted || this == topLevelParent(); bool firstTextChildOfEncapsulatedMsg = msgPart().typeStr().lower() == "text" && msgPart().subtypeStr().lower() == "plain" && - tqparentNode() && - tqparentNode()->msgPart().typeStr().lower() == "message"; + parentNode() && + parentNode()->msgPart().typeStr().lower() == "message"; typeBlacklisted = typeBlacklisted || firstTextChildOfEncapsulatedMsg; info.displayInHeader = !info.label.isEmpty() && !info.icon.isEmpty() && !typeBlacklisted; return info; diff --git a/kmail/partNode.h b/kmail/partNode.h index babd9a1b0..a043e1403 100644 --- a/kmail/partNode.h +++ b/kmail/partNode.h @@ -179,7 +179,7 @@ public: partNode* findNodeForDwPart( DwBodyPart* part ); - void fillMimePartTree( KMMimePartTreeItem* tqparentItem, + void fillMimePartTree( KMMimePartTreeItem* parentItem, KMMimePartTree* mimePartTree, TQString labelDescr = TQString(), TQString labelCntType = TQString(), @@ -248,7 +248,7 @@ public: const TQString& trueFromAddress() const; const partNode * topLevelParent() const; - partNode * tqparentNode() const { return mRoot; } + partNode * parentNode() const { return mRoot; } partNode * nextSibling() const { return mNext; } partNode * firstChild() const { return mChild; } partNode * next( bool allowChildren=true ) const; diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 5e8175dcf..59d22c54a 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -291,7 +291,7 @@ int RecipientLine::setComboWidth( int w ) w = TQMAX( w, mCombo->tqsizeHint().width() ); mCombo->setFixedWidth( w ); mCombo->updateGeometry(); - tqparentWidget()->updateGeometry(); + parentWidget()->updateGeometry(); return w; } @@ -536,7 +536,7 @@ void RecipientsView::resizeView() // setFixedHeight( mLineHeight * mLines.count() ); } - tqparentWidget()->tqlayout()->activate(); + parentWidget()->tqlayout()->activate(); emit tqsizeHintChanged(); TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) ); } diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui index acef26ca8..287605aa3 100644 --- a/kmail/smimeconfiguration.ui +++ b/kmail/smimeconfiguration.ui @@ -409,5 +409,5 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP <slot>setDisabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui index 0e3e7ece1..5cdf04c73 100644 --- a/kmail/snippetdlgbase.ui +++ b/kmail/snippetdlgbase.ui @@ -169,7 +169,7 @@ <tabstop>btnAdd</tabstop> <tabstop>btnCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index a1596625d..a9949cb55 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -177,7 +177,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 12da05014..442a36e15 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -661,9 +661,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ dlg.setCaption(i18n("Enter Values for Variables")); TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); - TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop"); - TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar"); - TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutBtn"); + 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"); KTextEdit *te = NULL; TQLabel * labTop = NULL; @@ -673,8 +673,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, labTop->sizePolicy().hasHeightForWidth() ) ); labTop->setText(i18n("Enter the replacement values for these variables:")); - tqlayoutTop->addWidget(labTop, 0, 0); - tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 ); + layoutTop->addWidget(labTop, 0, 0); + tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); int i = 0; //walk through the variable map and add @@ -685,10 +685,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ cb = new TQCheckBox( &dlg, "cbVar" ); cb->setChecked( FALSE ); cb->setText(it.key()); - tqlayoutVar->addWidget( cb, i ,0, TQt::AlignTop ); + layoutVar->addWidget( cb, i ,0, TQt::AlignTop ); te = new KTextEdit( &dlg, "teVar" ); - tqlayoutVar->addWidget( te, i, 1, TQt::AlignTop ); + layoutVar->addWidget( te, i, 1, TQt::AlignTop ); if ((*mapSave)[it.key()].length() > 0) { cb->setChecked( TRUE ); @@ -705,20 +705,20 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ i++; } - tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 ); + tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn1->sizePolicy().hasHeightForWidth() ) ); - tqlayoutBtn->addWidget( btn1, 0, 0 ); + 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->sizePolicy().hasHeightForWidth() ) ); - tqlayoutBtn->addWidget( btn2, 0, 1 ); + layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 ); + tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots @@ -750,8 +750,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ } bReturn = true; - iBasicHeight = dlg.tqgeometry().height() - tqlayoutVar->tqgeometry().height(); - iOneHeight = tqlayoutVar->tqgeometry().height() / mapVar2Te.count(); + iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height(); + iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count(); iWidth = dlg.tqgeometry().width(); } @@ -764,9 +764,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2) delete it2.data(); mapVar2Cb.clear(); - delete tqlayoutTop; - delete tqlayoutVar; - delete tqlayoutBtn; + delete layoutTop; + delete layoutVar; + delete layoutBtn; delete tqlayout; if (i==0) //if nothing happened this means, that there are no variables to translate @@ -789,18 +789,18 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri dlg.setCaption(i18n("Enter Values for Variables")); TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); - TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop"); - TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar"); - TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "tqlayoutBtn"); + 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"); KTextEdit *te = NULL; TQLabel * labTop = NULL; TQCheckBox * cb = NULL; labTop = new TQLabel( &dlg, "label" ); - tqlayoutTop->addWidget(labTop, 0, 0); + layoutTop->addWidget(labTop, 0, 0); labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var )); - tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 ); + tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); cb = new TQCheckBox( &dlg, "cbVar" ); @@ -808,8 +808,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri cb->setText(i18n( "Make value &default" )); te = new KTextEdit( &dlg, "teVar" ); - tqlayoutVar->addWidget( te, 0, 1, TQt::AlignTop); - tqlayoutVar->addWidget( cb, 1, 1, TQt::AlignTop); + layoutVar->addWidget( te, 0, 1, TQt::AlignTop); + layoutVar->addWidget( cb, 1, 1, TQt::AlignTop); if ((*mapSave)[var].length() > 0) { cb->setChecked( TRUE ); te->setText((*mapSave)[var]); @@ -820,16 +820,16 @@ 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( tqlayoutVar, 1, 1, 0, 1 ); + tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); - tqlayoutBtn->addWidget( btn1, 0, 0 ); + layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); btn2->setDefault( TRUE ); - tqlayoutBtn->addWidget( btn2, 0, 1 ); + layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 ); + tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); te->setFocus(); // --END-- building a dynamic dialog @@ -858,9 +858,9 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri delete labTop; delete btn1; delete btn2; - delete tqlayoutTop; - delete tqlayoutVar; - delete tqlayoutBtn; + delete layoutTop; + delete layoutVar; + delete layoutBtn; delete tqlayout; return strReturn; diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index e476749e6..49ece85dd 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -100,7 +100,7 @@ void SubscriptionDialogBase::moveChildrenToNewParent( GroupItem *oldItem, GroupI { oldItem->takeItem(cur); item->insertItem(cur); - if ( cur->isSelected() ) // we have new tqparents so open them + if ( cur->isSelected() ) // we have new parents so open them folderTree()->ensureItemVisible( cur ); ++it; } @@ -115,15 +115,15 @@ void SubscriptionDialogBase::createListViewItem( int i ) // get the tqparent GroupItem *oldItem = 0; - TQString tqparentPath; - findParentItem( mFolderNames[i], mFolderPaths[i], tqparentPath, &tqparent, &oldItem ); + TQString parentPath; + findParentItem( mFolderNames[i], mFolderPaths[i], parentPath, &tqparent, &oldItem ); - if (!tqparent && tqparentPath != "/") + if (!tqparent && parentPath != "/") { // the tqparent is not available and it's no root-item // this happens when the folders do not arrive in hierarchical order // so we create each tqparent in advance - TQStringList folders = TQStringList::split(mDelimiter, tqparentPath); + TQStringList folders = TQStringList::split(mDelimiter, parentPath); uint i = 0; for ( TQStringList::Iterator it = folders.begin(); it != folders.end(); ++it ) { @@ -198,18 +198,18 @@ void SubscriptionDialogBase::createListViewItem( int i ) //------------------------------------------------------------------------------ -void SubscriptionDialogBase::findParentItem( TQString &name, TQString &path, TQString &tqparentPath, +void SubscriptionDialogBase::findParentItem( TQString &name, TQString &path, TQString &parentPath, GroupItem **tqparent, GroupItem **oldItem ) { // remove the name (and the separator) from the path to get the tqparent path int start = path.length() - (name.length()+2); int length = name.length()+1; if (start < 0) start = 0; - tqparentPath = path; - tqparentPath.remove(start, length); + parentPath = path; + parentPath.remove(start, length); // find the tqparent by it's path - *tqparent = mItemDict[tqparentPath]; + *tqparent = mItemDict[parentPath]; // check if the item already exists *oldItem = mItemDict[path]; diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index 116416eb4..fba3da7ef 100644 --- a/kmail/templatesconfiguration_base.ui +++ b/kmail/templatesconfiguration_base.ui @@ -324,7 +324,7 @@ <data format="PNG" length="807">89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002ee49444154388d7d93cd6b5c6514c67fe7bdef9d8f24d349c66412a203b1b4282d21140918824816418a0b454d75e1a28ab8c8dfe1c25d70e34e0812ea4644d13610c43a1121b5d84cab6943486227499d869ae6633e32f7de79ef71d58644f0593dabdf39cf7938a2aa4c4f4f9b300c0b954ae56ca55249876128aa2a9c90738eadadada0542afd954ea7cb636363a19d9f9f4755cff6f4a53e4d67ed78f7b37ebb8b05e3810818017d0a68f1dcc36463a7ea8a4b8bdb9fcccdcdddf6eaf5bae4f3f9f7bb7a773faee94fed81b983a6d6d9ab6eb2f5f73affec6de1a536c9e4d7497696c9f63cf237d66b85b5e570cf3977c7aeaeae9a42a130d03d506bdbaddda3d1805faec6dc5a68e2a208e30124187a39c9ebefa6c8f544f84949a9ea69e75cd60641c0e1e1a1b8b849142ac51f226ece1f32fc4a86f31732f86db076178ad70e20765cfae8142207009eaafac639270022c2fd15a1b470c8f81b59defed0637024c44596c269cb3b1fe4585c68f2c76f0e23064000639e5c5804caab2d8c24187ed5c3265adc5bf4b9f2f91e377eae73fe254b6fbfc7ea7283588f9a314756089b31ed5925dd61b87b2bc5d75fd4a91d843c7fa68d5caf23fb4c8246fdc9f01300e3412e9f60f7313c285b6edf0c696bf338f3620773df3de2ea15d8de0ce92f2448f8472bd8a700515e18146e5c3714afd5197f3343ae3b463ce1cbcf94efbf7a48b6cb303462595c3801505514280c182ebed5ce37333bec3f8e387721859f80da7e8c114714097b3be65804eb799e562a95e641358e4d47cb8cbc66c9f5f6f1eb8f55967eafa140bedfe7e27b7dac2c4588a7ec6cb7622004629b4c2629954a7fda6c6b3f5f08baac1f61bd2683c3867a358931865339c8e69a9c1b323cb87fc0fa72d81091351189646262426667677b620e2fabea25942e504144fef34d80735a752daeab9a6f7ddf5f9162b1c8e4e4a45f2e974f0541d0a3aa19c03f16f4b862a061adddc96432bba2aaccccccc8d4d494b7b1b1910c8220a1aae6ff00d6da56676767303a3a1afd0b29d2596f22d0b7b20000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>templatesinsertcommand.h</includehint> diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index a2a823370..137dbfcdc 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -73,7 +73,7 @@ void TreeBase::addChildFolder() const KMFolder *fld = folder(); if ( fld ) { - mFolderTree->addChildFolder( (KMFolder *) fld, tqparentWidget() ); + mFolderTree->addChildFolder( (KMFolder *) fld, parentWidget() ); reload( mLastMustBeReadWrite, mLastShowOutbox, mLastShowImapFolders ); setFolder( (KMFolder *) fld ); } diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui index d7da3cea4..c31bdb381 100644 --- a/kmail/warningconfiguration.ui +++ b/kmail/warningconfiguration.ui @@ -404,5 +404,5 @@ The recommended SPHINX setting is 14 days. <tabstop>mWarnEncrRootCertExpiresSB</tabstop> <tabstop>enableAllWarningsPB</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx index 40f3da26d..5dd8c6e51 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cxx @@ -410,9 +410,9 @@ TQString FilterOE::getFolderName(TQString filename) } } else { TQString _currentID = tmp[2]; - TQString _tqparentID = tmp[3]; + TQString _parentID = tmp[3]; if(_currentID == search) { - if(_tqparentID.isEmpty()) { // this is the root of the folder + if(_parentID.isEmpty()) { // this is the root of the folder found = true; break; } else { diff --git a/kmailcvt/kimportpagedlg.ui b/kmailcvt/kimportpagedlg.ui index 8831ff5aa..cdb9eaa7b 100644 --- a/kmailcvt/kimportpagedlg.ui +++ b/kmailcvt/kimportpagedlg.ui @@ -203,5 +203,5 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmailcvt/kselfilterpagedlg.ui b/kmailcvt/kselfilterpagedlg.ui index cfaad1e1c..de52967ef 100644 --- a/kmailcvt/kselfilterpagedlg.ui +++ b/kmailcvt/kselfilterpagedlg.ui @@ -140,5 +140,5 @@ This program will help you import your email from your previous email program in </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmobile/devices/gnokii/gnokiiconfigui.ui b/kmobile/devices/gnokii/gnokiiconfigui.ui index 542094092..d550eb9a2 100644 --- a/kmobile/devices/gnokii/gnokiiconfigui.ui +++ b/kmobile/devices/gnokii/gnokiiconfigui.ui @@ -269,5 +269,5 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui index 48e1fb067..7088a6ff0 100644 --- a/kmobile/kmobile_selectiondialog.ui +++ b/kmobile/kmobile_selectiondialog.ui @@ -105,7 +105,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kmobile/libkmobile.desktop b/kmobile/libkmobile.desktop index dedeb3701..f5a1e746a 100644 --- a/kmobile/libkmobile.desktop +++ b/kmobile/libkmobile.desktop @@ -28,11 +28,11 @@ Name[kk]=KDE-нің қалта құрылғы жабдықтың төмен де Name[km]=កម្មវិធីបញ្ជាផ្នែករឹងកម្រិតទាបរបស់ឧបករណ៍ចល័ត KDE Name[lt]=KDE mobiliųjų įrenginių žemo lygmens aparatinės įrangos tvarkyklė Name[ms]=Pemacu Perkakasan Tahap Rendah Peranti Mudah Alih KDE -Name[nb]=KDE lavnivå tqmaskinvaredriver for mobile enheter +Name[nb]=KDE lavnivå maskinvaredriver for mobile enheter Name[nds]=Sietstoop-Driever för Mobilreedschappen Name[ne]=केडीई मोबाइल यन्त्रको न्यूनस्तर हार्डवेयर ड्राइभर Name[nl]=Hardware-stuurprogramma voor mobiele apparaten -Name[nn]=Lågnivå tqmaskinvaredrivar for mobileiningar i KDE +Name[nn]=Lågnivå maskinvaredrivar for mobileiningar i KDE Name[pl]=Niskopoziomowy sterownik sprzętu urządzenia przenośnego dla KDE Name[pt]=Controlador de Baixo-Nível de Dispositivos Móveis do KDE Name[pt_BR]=Driver de Hardware de Baixo Nível de Dispositivos Móveis do KDE diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp index 4984b69a2..e9839b994 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -115,7 +115,7 @@ bool KNFolder::readInfo(const TQString &infoPath) if (!isRootFolder() && !isStandardFolder()) { n_ame=info.readEntry("name"); i_d=info.readNumEntry("id", -1); - p_arentId=info.readNumEntry("tqparentId", -1); + p_arentId=info.readNumEntry("parentId", -1); } w_asOpen=info.readBoolEntry("wasOpen", true); @@ -147,7 +147,7 @@ void KNFolder::saveInfo() if (!isRootFolder() && !isStandardFolder()) { info.writeEntry("name", n_ame); info.writeEntry("id", i_d); - info.writeEntry("tqparentId", p_arentId); + info.writeEntry("parentId", p_arentId); } if(l_istItem) info.writeEntry("wasOpen", l_istItem->isOpen()); diff --git a/knode/knfolder.h b/knode/knfolder.h index 692e02a68..632dbc6e5 100644 --- a/knode/knfolder.h +++ b/knode/knfolder.h @@ -38,7 +38,7 @@ class KNFolder : public KNArticleCollection { //id int id() const { return i_d; } void setId(int i) { i_d=i; } - int tqparentId() const { return p_arentId; } + int parentId() const { return p_arentId; } bool isStandardFolder() { return (i_d > 0) && (i_d <=3); } bool isRootFolder() { return i_d==0; } diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp index c1c2d2e8a..bdac2f2b9 100644 --- a/knode/knfoldermanager.cpp +++ b/knode/knfoldermanager.cpp @@ -463,11 +463,11 @@ int KNFolderManager::loadCustomFolders() delete f; } - // set tqparents + // set parents if(cnt>0) { for ( TQValueList<KNFolder*>::Iterator it = mFolderList.begin(); it != mFolderList.end(); ++it ) { if ( !(*it)->isRootFolder() ) { // the root folder has no tqparent - KNFolder *par = folder( (*it)->tqparentId() ); + KNFolder *par = folder( (*it)->parentId() ); if ( !par ) par = root(); (*it)->setParent( par ); diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index a3328b8e0..bfd374060 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -104,7 +104,7 @@ TQString KNGroupSelectDialog::selectedGroups()const } if (moderated && (count>=2)) // warn the user - KMessageBox::information(tqparentWidget(),i18n("You are crossposting to a moderated newsgroup.\nPlease be aware that your article will not appear in any group\nuntil it has been approved by the moderators of the moderated group."), + KMessageBox::information(parentWidget(),i18n("You are crossposting to a moderated newsgroup.\nPlease be aware that your article will not appear in any group\nuntil it has been approved by the moderators of the moderated group."), TQString(),"crosspostModeratedWarning"); return ret; diff --git a/knode/knode.h b/knode/knode.h index 8d82defe6..f0dbca585 100644 --- a/knode/knode.h +++ b/knode/knode.h @@ -47,7 +47,7 @@ class KNMainWindow : public KMainWindow TQ_OBJECT public: - KNMainWindow( TQWidget* tqparentWidget=0 ); + KNMainWindow( TQWidget* parentWidget=0 ); ~KNMainWindow(); void openURL( const KURL& ); KNMainWidget *mainWidget() { return m_mainWidget; } diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index 729d71f9f..1f95335e8 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -47,10 +47,10 @@ typedef KParts::GenericFactory< KNodePart > KNodeFactory; K_EXPORT_COMPONENT_FACTORY( libknodepart, KNodeFactory ) -KNodePart::KNodePart(TQWidget *tqparentWidget, const char *widgetName, +KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &) : KParts::ReadOnlyPart(tqparent, name), - mParentWidget( tqparentWidget ) + mParentWidget( parentWidget ) { kdDebug(5003) << "KNodePart()" << endl; kdDebug(5003) << " InstanceName: " << kapp->instanceName() << endl; @@ -67,7 +67,7 @@ KNodePart::KNodePart(TQWidget *tqparentWidget, const char *widgetName, knGlobals.instance = KNodeFactory::instance(); // create a canvas to insert our widget - TQWidget *canvas = new TQWidget(tqparentWidget, widgetName); + TQWidget *canvas = new TQWidget(parentWidget, widgetName); canvas->setFocusPolicy(TQ_ClickFocus); setWidget(canvas); @@ -114,7 +114,7 @@ void KNodePart::guiActivateEvent(KParts::GUIActivateEvent *e) } -TQWidget* KNodePart::tqparentWidget() const +TQWidget* KNodePart::parentWidget() const { return mParentWidget; } diff --git a/knode/knode_part.h b/knode/knode_part.h index b98b8d6fa..e8883cb60 100644 --- a/knode/knode_part.h +++ b/knode/knode_part.h @@ -44,11 +44,11 @@ class KNodePart: public KParts::ReadOnlyPart Q_OBJECT TQ_OBJECT public: - KNodePart(TQWidget *tqparentWidget, const char *widgetName, + KNodePart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &); virtual ~KNodePart(); - TQWidget* tqparentWidget() const; + TQWidget* parentWidget() const; static KAboutData *createAboutData(); diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui index ca6ac6c0b..b742d4dd7 100644 --- a/knode/smtpaccountwidget_base.ui +++ b/knode/smtpaccountwidget_base.ui @@ -223,7 +223,7 @@ <slot access="protected">useExternalMailerToggled(bool)</slot> <slot access="protected">loginToggled(bool)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kcmodule.h</include> </includes> diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index 55f1c6ff0..93a142299 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -149,7 +149,7 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *tqparent, const char connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )), TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) ); connect( this, TQT_SIGNAL(currentAlignmentChanged( int )), - TQT_TQOBJECT(this), TQT_SLOT(tqalignmentChanged( int )) ); + TQT_TQOBJECT(this), TQT_SLOT(alignmentChanged( int )) ); connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )), TQT_TQOBJECT(this), TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); } @@ -409,7 +409,7 @@ void KNoteEdit::colorChanged( const TQColor &c ) m_textColor->setIconSet( pix ); } -void KNoteEdit::tqalignmentChanged( int a ) +void KNoteEdit::alignmentChanged( int a ) { // TODO: AlignAuto if ( ( a == AlignAuto ) || ( a & AlignLeft ) ) diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h index 959dee654..dfceaef85 100644 --- a/knotes/knoteedit.h +++ b/knotes/knoteedit.h @@ -82,7 +82,7 @@ private slots: void fontChanged( const TQFont &f ); void colorChanged( const TQColor &c ); - void tqalignmentChanged( int a ); + void alignmentChanged( int a ); void verticalAlignmentChanged( VerticalAlignment a ); void slotAllowTab(); diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index a43f27b11..409eaf102 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -87,9 +87,9 @@ TQWidget *ListInputField::createWidget( TQWidget *tqparent ) } -ListWidget::ListWidget( InputField *tqparentField, const TQString &name, const TQString &type, TQWidget *tqparent ) +ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *tqparent ) : TQWidget( tqparent ), - mParentField( tqparentField ), mName( name ), mType( type ) + mParentField( parentField ), mName( name ), mType( type ) { TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 ); diff --git a/kode/kwsdl/kung/listinputfield.h b/kode/kwsdl/kung/listinputfield.h index d36e091ce..82940370f 100644 --- a/kode/kwsdl/kung/listinputfield.h +++ b/kode/kwsdl/kung/listinputfield.h @@ -57,7 +57,7 @@ class ListWidget : public TQWidget TQ_OBJECT public: - ListWidget( InputField *tqparentField, const TQString &name, const TQString &type, TQWidget *tqparent ); + ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *tqparent ); void update(); diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index b060cc8a6..d43e78f5d 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -80,7 +80,7 @@ class KDE_EXPORT Core : public KParts::MainWindow void dayChanged( const TQDate& ); protected: - Core( TQWidget *tqparentWidget = 0, const char *name = 0 ); + Core( TQWidget *parentWidget = 0, const char *name = 0 ); TQString lastErrorMessage() const; diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 1c1812cec..bc0d683e7 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -114,9 +114,9 @@ void KCMKMailSummary::initFolders() displayName ) ); } else { const int pos = (*it).tqfindRev( '/' ); - const TQString tqparentFolder = (*it).left( pos ); + const TQString parentFolder = (*it).left( pos ); mFolderMap.insert( *it, - new TQCheckListItem( mFolderMap[ tqparentFolder ], + new TQCheckListItem( mFolderMap[ parentFolder ], displayName, TQCheckListItem::CheckBox ) ); } diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index a72f14b7e..5010bf7d9 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -59,9 +59,9 @@ KParts::ReadOnlyPart* KNotesPlugin::createPart() return new KNotesPart( this, "notes" ); } -Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *tqparentWidget ) +Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *parentWidget ) { - return new KNotesSummaryWidget( this, tqparentWidget ); + return new KNotesSummaryWidget( this, parentWidget ); } const KAboutData *KNotesPlugin::aboutData() diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h index 680eb7f5f..de48b2ff6 100644 --- a/kontact/plugins/knotes/knotes_plugin.h +++ b/kontact/plugins/knotes/knotes_plugin.h @@ -38,7 +38,7 @@ class KNotesPlugin : public Kontact::Plugin KNotesPlugin( Kontact::Core *core, const char *name, const TQStringList& ); ~KNotesPlugin(); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); int weight() const { return 600; } diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp index 402d1e21a..c4044b4b1 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.cpp +++ b/kontact/plugins/kpilot/kpilot_plugin.cpp @@ -43,9 +43,9 @@ KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStrin } -Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *tqparentWidget ) +Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *parentWidget ) { - return new SummaryWidget( tqparentWidget ); + return new SummaryWidget( parentWidget ); } const KAboutData *KPilotPlugin::aboutData() diff --git a/kontact/plugins/kpilot/kpilot_plugin.h b/kontact/plugins/kpilot/kpilot_plugin.h index b1a08cbef..5695d2605 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.h +++ b/kontact/plugins/kpilot/kpilot_plugin.h @@ -33,7 +33,7 @@ class KPilotPlugin : public Kontact::Plugin KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& ); KPilotPlugin(); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); virtual bool showInSideBar() const { return false; } // virtual TQStringList configModules() const; diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 18a8871e6..7c3d05875 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -153,22 +153,22 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *tqparent, const char *name ) void KCMKontactKNT::loadNews() { - TQValueVector<TQListViewItem*> tqparents; + TQValueVector<TQListViewItem*> parents; TQValueVector<TQListViewItem*>::Iterator it; - tqparents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) ); - tqparents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) ); - tqparents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) ); - tqparents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) ); - tqparents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) ); - tqparents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) ); - for ( it = tqparents.begin(); it != tqparents.end(); ++it ) + for ( it = parents.begin(); it != parents.end(); ++it ) (*it)->setSelectable( false ); for ( int i = 0; i < DEFAULT_NEWSSOURCES; ++i ) { NewsSourceData data = NewsSourceDefault[ i ]; - new NewsItem( tqparents[ data.category() ], data.name(), data.url(), false ); + new NewsItem( parents[ data.category() ], data.name(), data.url(), false ); mFeedMap.insert( data.url(), data.name() ); } } diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp index 4b187ea47..671ed5a23 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.cpp +++ b/kontact/plugins/newsticker/newsticker_plugin.cpp @@ -37,7 +37,7 @@ NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const setInstance( NewsTickerPluginFactory::instance() ); } -Kontact::Summary *NewsTickerPlugin::createSummaryWidget( TQWidget* tqparentWidget ) +Kontact::Summary *NewsTickerPlugin::createSummaryWidget( TQWidget* parentWidget ) { - return new SummaryWidget( tqparentWidget ); + return new SummaryWidget( parentWidget ); } diff --git a/kontact/plugins/newsticker/newsticker_plugin.h b/kontact/plugins/newsticker/newsticker_plugin.h index e651e7dd7..b3c0b651d 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.h +++ b/kontact/plugins/newsticker/newsticker_plugin.h @@ -31,7 +31,7 @@ class NewsTickerPlugin : public Kontact::Plugin NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& ); NewsTickerPlugin(); - virtual Kontact::Summary *createSummaryWidget( TQWidget* tqparentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget* parentWidget ); protected: virtual KParts::ReadOnlyPart* createPart() { return 0L; } diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index 316f94a77..9dc5e9828 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -49,9 +49,9 @@ SpecialdatesPlugin::~SpecialdatesPlugin() { } -Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *tqparentWidget ) +Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *parentWidget ) { - return new SDSummaryWidget( this, tqparentWidget ); + return new SDSummaryWidget( this, parentWidget ); } const KAboutData *SpecialdatesPlugin::aboutData() diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h index fc3598029..f1feb68b3 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.h +++ b/kontact/plugins/specialdates/specialdates_plugin.h @@ -39,7 +39,7 @@ class SpecialdatesPlugin : public Kontact::Plugin const KAboutData *aboutData(); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); protected: virtual KParts::ReadOnlyPart *createPart() { return false; } diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index d8cfe9e6a..93311c7d2 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -41,7 +41,7 @@ #include <kservice.h> -TestPart::TestPart(TQObject *tqparent, const char *name) // ## tqparentWidget +TestPart::TestPart(TQObject *tqparent, const char *name) // ## parentWidget : KParts::ReadOnlyPart(tqparent, name) { setInstance( new KInstance("testpart") ); // ## memleak diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp index 9d9f5dfde..564465bed 100644 --- a/kontact/plugins/weather/weather_plugin.cpp +++ b/kontact/plugins/weather/weather_plugin.cpp @@ -37,9 +37,9 @@ WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStr setInstance( WeatherPluginFactory::instance() ); } -Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *tqparentWidget ) +Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *parentWidget ) { - return new SummaryWidget( tqparentWidget ); + return new SummaryWidget( parentWidget ); } const KAboutData *WeatherPlugin::aboutData() diff --git a/kontact/plugins/weather/weather_plugin.h b/kontact/plugins/weather/weather_plugin.h index 924eb0a32..4ab019645 100644 --- a/kontact/plugins/weather/weather_plugin.h +++ b/kontact/plugins/weather/weather_plugin.h @@ -31,7 +31,7 @@ class WeatherPlugin : public Kontact::Plugin WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& ); WeatherPlugin(); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); const KAboutData *aboutData(); diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 5b1ff2bd8..85e7e7a4f 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -344,7 +344,7 @@ void Navigator::updatePlugins( TQValueList<Kontact::Plugin*> plugins_ ) minWidth = item->width( this ); } - tqparentWidget()->setFixedWidth( minWidth ); + parentWidget()->setFixedWidth( minWidth ); } void Navigator::dragEnterEvent( TQDragEnterEvent *event ) @@ -491,7 +491,7 @@ void Navigator::slotShowRMBMenu( TQListBoxItem *, const TQPoint &pos ) if (width > maxWidth) maxWidth = width; } - tqparentWidget()->setFixedWidth( maxWidth ); + parentWidget()->setFixedWidth( maxWidth ); triggerUpdate( true ); } diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 582b895a6..8439b4fce 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -805,12 +805,12 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) TQWidget *tqfocusWidget = kapp->tqfocusWidget(); if ( mCurrentPlugin && tqfocusWidget ) { // save the focus widget only when it belongs to the activated part - TQWidget *tqparent = tqfocusWidget->tqparentWidget(); + TQWidget *tqparent = tqfocusWidget->parentWidget(); while ( tqparent ) { if ( tqparent == mCurrentPlugin->part()->widget() ) mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) ); - tqparent = tqparent->tqparentWidget(); + tqparent = tqparent->parentWidget(); } } diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index bdf334014..115be5ffc 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1314,12 +1314,12 @@ void CalendarView::newSubTodo() if ( todo ) newSubTodo( todo ); } -void CalendarView::newSubTodo(Todo *tqparentEvent) +void CalendarView::newSubTodo(Todo *parentEvent) { KOTodoEditor *todoEditor = mDialogManager->getTodoEditor(); connectIncidenceEditor( todoEditor ); todoEditor->newTodo(); - todoEditor->setDates( TQDateTime(), false, tqparentEvent ); + todoEditor->setDates( TQDateTime(), false, parentEvent ); todoEditor->show(); } diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index 27a9d9c4d..f1bdc7902 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -312,7 +312,7 @@ Only to-dos which have least one attendee will be checked. If you are not in th <Q_SLOTS> <slot>updateFilter()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/korganizer/ical2vcal.in b/korganizer/ical2vcal.in index 3bdbdb722..c83f60104 100755 --- a/korganizer/ical2vcal.in +++ b/korganizer/ical2vcal.in @@ -75,7 +75,7 @@ sub process_appointment { undef(%curappt); - # this is a count of the total # of tqparentheses. + # this is a count of the total # of parentheses. while ($pcount) { $line = &getLine; diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index f2ac4ac7a..8a49360f3 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -1276,7 +1276,7 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth ) // kdDebug(5850) << "KOAgenda::placeAgendaItem(): " << item->incidence()->summary() // << " subCellWidth: " << subCellWidth << endl; - // "left" upper corner, no subcells yet, RTL tqlayouts have right/left switched, widths are negative then + // "left" upper corner, no subcells yet, RTL layouts have right/left switched, widths are negative then TQPoint pt = gridToContents( TQPoint( item->cellXLeft(), item->cellYTop() ) ); // right lower corner TQPoint pt1 = gridToContents( TQPoint( item->cellXLeft() + item->cellWidth(), @@ -1393,7 +1393,7 @@ void KOAgenda::drawContents(TQPainter* p, int cx, int cy, int cw, int ch) if ( pt2.x() >= pt1.x() /*&& pt2.y() >= pt1.y()*/) { int gxStart = contentsToGrid( pt1 ).x(); int gxEnd = contentsToGrid( pt2 ).x(); - // correct start/end for rtl tqlayouts + // correct start/end for rtl layouts if ( gxStart > gxEnd ) { int tmp = gxStart; gxStart = gxEnd; diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index b55e92b9c..3b0e51b56 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h @@ -222,7 +222,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer void createDayLabels( bool force ); /** - Set the tqmasks on the agenda widgets indicating, which days are holidays. + Set the masks on the agenda widgets indicating, which days are holidays. */ void setHolidayMasks(); diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index cae637613..296bde57f 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -91,7 +91,7 @@ KODialogManager::KODialogManager( CalendarView *mainView ) : mCategoryEditDialog = new KPIM::CategoryEditDialog( KOPrefs::instance(), mMainView ); // don't set any specific tqparent for the dialog, as its kept around and reused - // in different cases where it should have different tqparents + // in different cases where it should have different parents KWin::setMainWindow( mCategoryEditDialog, 0 ); connect( mainView, TQT_SIGNAL( categoriesChanged() ), mCategoryEditDialog, TQT_SLOT( reload() ) ); diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui index 64f10a317..980a93ace 100644 --- a/korganizer/koeditoralarms_base.ui +++ b/korganizer/koeditoralarms_base.ui @@ -662,7 +662,7 @@ <includes> <include location="global" impldecl="in declaration">addresseelineedit.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index e09007508..0849682ec 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -104,36 +104,36 @@ void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) TQFrame *timeBoxFrame = new TQFrame(timeGroupBox); - TQGridLayout *tqlayoutTimeBox = new TQGridLayout( timeBoxFrame ); - tqlayoutTimeBox->setSpacing(topLayout->spacing()); - tqlayoutTimeBox->setColStretch( 3, 1 ); + TQGridLayout *layoutTimeBox = new TQGridLayout( timeBoxFrame ); + layoutTimeBox->setSpacing(topLayout->spacing()); + layoutTimeBox->setColStretch( 3, 1 ); mStartDateLabel = new TQLabel(i18n("&Start:"),timeBoxFrame); - tqlayoutTimeBox->addWidget(mStartDateLabel,0,0); + layoutTimeBox->addWidget(mStartDateLabel,0,0); mStartDateEdit = new KDateEdit(timeBoxFrame); - tqlayoutTimeBox->addWidget(mStartDateEdit,0,1); + layoutTimeBox->addWidget(mStartDateEdit,0,1); mStartDateLabel->setBuddy( mStartDateEdit ); mStartTimeEdit = new KTimeEdit(timeBoxFrame); - tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2); + layoutTimeBox->addWidget(mStartTimeEdit,0,2); mEndDateLabel = new TQLabel(i18n("&End:"),timeBoxFrame); - tqlayoutTimeBox->addWidget(mEndDateLabel,1,0); + layoutTimeBox->addWidget(mEndDateLabel,1,0); mEndDateEdit = new KDateEdit(timeBoxFrame); - tqlayoutTimeBox->addWidget(mEndDateEdit,1,1); + layoutTimeBox->addWidget(mEndDateEdit,1,1); mEndDateLabel->setBuddy( mEndDateEdit ); mEndTimeEdit = new KTimeEdit(timeBoxFrame); - tqlayoutTimeBox->addWidget(mEndTimeEdit,1,2); + layoutTimeBox->addWidget(mEndTimeEdit,1,2); mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame); - tqlayoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 ); + layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 ); connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool))); mDurationLabel = new TQLabel( timeBoxFrame ); - tqlayoutTimeBox->addWidget( mDurationLabel, 1, 3 ); + layoutTimeBox->addWidget( mDurationLabel, 1, 3 ); // time widgets are checked if they contain a valid time connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), @@ -148,9 +148,9 @@ void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) this, TQT_SLOT(endDateChanged(const TQDate&))); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); - tqlayoutTimeBox->addWidget( label, 2, 0 ); + layoutTimeBox->addWidget( label, 2, 0 ); TQBoxLayout *recLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 ); + layoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 ); mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); @@ -160,18 +160,18 @@ void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) recLayout->addStretch( 1 ); label = new TQLabel( i18n("Reminder:"), timeBoxFrame ); - tqlayoutTimeBox->addWidget( label, 3, 0 ); + layoutTimeBox->addWidget( label, 3, 0 ); TQBoxLayout *alarmLineLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 ); + layoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 ); initAlarm( timeBoxFrame, alarmLineLayout ); alarmLineLayout->addStretch( 1 ); TQBoxLayout *secLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addLayout( secLayout, 0, 4 ); + layoutTimeBox->addLayout( secLayout, 0, 4 ); initSecrecy( timeBoxFrame, secLayout ); TQBoxLayout *classLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addLayout( classLayout, 1, 4 ); + layoutTimeBox->addLayout( classLayout, 1, 4 ); initClass( timeBoxFrame, classLayout ); } diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index d5856dd63..af001503f 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -105,59 +105,59 @@ void KOEditorGeneralTodo::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) i18n("Sets options for due and start dates and times " "for this to-do.") ); - TQGridLayout *tqlayoutTimeBox = new TQGridLayout(timeBoxFrame,1,1); - tqlayoutTimeBox->setSpacing(topLayout->spacing()); + TQGridLayout *layoutTimeBox = new TQGridLayout(timeBoxFrame,1,1); + layoutTimeBox->setSpacing(topLayout->spacing()); TQString whatsThis = i18n("Sets the start date for this to-do"); mStartCheck = new TQCheckBox(i18n("Sta&rt:"),timeBoxFrame); TQWhatsThis::add( mStartCheck, whatsThis ); - tqlayoutTimeBox->addWidget(mStartCheck,0,0); + layoutTimeBox->addWidget(mStartCheck,0,0); connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableStartEdit(bool))); connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(startDateModified())); mStartDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mStartDateEdit, whatsThis ); - tqlayoutTimeBox->addWidget(mStartDateEdit,0,1); + layoutTimeBox->addWidget(mStartDateEdit,0,1); connect(mStartDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(startDateModified())); mStartTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mStartTimeEdit, i18n("Sets the start time for this to-do.") ); - tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2); + layoutTimeBox->addWidget(mStartTimeEdit,0,2); connect(mStartTimeEdit,TQT_SIGNAL(timeChanged(TQTime)),TQT_SLOT(startDateModified())); whatsThis = i18n("Sets the due date for this to-do."); mDueCheck = new TQCheckBox(i18n("&Due:"),timeBoxFrame); TQWhatsThis::add( mDueCheck, whatsThis ); - tqlayoutTimeBox->addWidget(mDueCheck,1,0); + layoutTimeBox->addWidget(mDueCheck,1,0); connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableDueEdit(bool))); connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SIGNAL(dueDateEditToggle(bool))); connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); mDueDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mDueDateEdit, whatsThis ); - tqlayoutTimeBox->addWidget(mDueDateEdit,1,1); + layoutTimeBox->addWidget(mDueDateEdit,1,1); connect(mDueDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(dateChanged())); mDueTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mDueTimeEdit, i18n("Sets the due time for this to-do.") ); - tqlayoutTimeBox->addWidget(mDueTimeEdit,1,2); + layoutTimeBox->addWidget(mDueTimeEdit,1,2); connect(mDueTimeEdit,TQT_SIGNAL(timeChanged( TQTime )),TQT_SLOT(dateChanged())); mTimeButton = new TQCheckBox(i18n("Ti&me associated"),timeBoxFrame); TQWhatsThis::add( mTimeButton, i18n("Sets whether or not this to-do's start and due dates " "have times associated with them.") ); - tqlayoutTimeBox->addWidget( mTimeButton, 0, 3 ); + layoutTimeBox->addWidget( mTimeButton, 0, 3 ); connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableTimeEdits(bool))); connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); - tqlayoutTimeBox->addWidget( label, 3, 0 ); + layoutTimeBox->addWidget( label, 3, 0 ); TQBoxLayout *recLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addMultiCellLayout( recLayout, 3, 3, 1, 4 ); + layoutTimeBox->addMultiCellLayout( recLayout, 3, 3, 1, 4 ); mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); @@ -167,17 +167,17 @@ void KOEditorGeneralTodo::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) recLayout->addStretch( 1 ); label = new TQLabel( i18n("Reminder:"), timeBoxFrame ); - tqlayoutTimeBox->addWidget( label, 4, 0 ); + layoutTimeBox->addWidget( label, 4, 0 ); TQBoxLayout *alarmLineLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 4, 4, 1, 4 ); + layoutTimeBox->addMultiCellLayout( alarmLineLayout, 4, 4, 1, 4 ); initAlarm( timeBoxFrame, alarmLineLayout ); alarmLineLayout->addStretch( 1 ); - // some more tqlayouting - tqlayoutTimeBox->setColStretch( 3, 1 ); + // some more layouting + layoutTimeBox->setColStretch( 3, 1 ); TQBoxLayout *secLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addLayout( secLayout, 0, 4 ); + layoutTimeBox->addLayout( secLayout, 0, 4 ); initSecrecy( timeBoxFrame, secLayout ); } diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 21deaeed6..67b2a9719 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -991,12 +991,12 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* tqparent, const char *name ) : } // TQFrame *timeFrame = new TQFrame( mTimeGroupBox ); -// TQBoxLayout *tqlayoutTimeFrame = new TQHBoxLayout( timeFrame ); -// tqlayoutTimeFrame->setSpacing( KDialog::spacingHint() ); +// TQBoxLayout *layoutTimeFrame = new TQHBoxLayout( timeFrame ); +// layoutTimeFrame->setSpacing( KDialog::spacingHint() ); mDateTimeLabel = new TQLabel( mTimeGroupBox ); // mDateTimeLabel = new TQLabel( timeFrame ); -// tqlayoutTimeFrame->addWidget( mDateTimeLabel ); +// layoutTimeFrame->addWidget( mDateTimeLabel ); Qt::Orientation orientation; if ( KOPrefs::instance()->mCompactDialogs ) orientation = Qt::Horizontal; diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 391ad42ac..2a49934a5 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -105,7 +105,7 @@ void KOEventViewer::writeSettings( KConfig * config ) void KOEventViewer::setSource( const TQString &n ) { - UriHandler::process( tqparentWidget(), n ); + UriHandler::process( parentWidget(), n ); } bool KOEventViewer::appendIncidence( Incidence *incidence, const TQDate &date ) @@ -177,10 +177,10 @@ void KOEventViewer::contentsContextMenuEvent( TQContextMenuEvent *e ) switch( menu->exec( TQCursor::pos(), 0 ) ) { case 0: // open - AttachmentHandler::view( tqparentWidget(), name, uid ); + AttachmentHandler::view( parentWidget(), name, uid ); break; case 1: // save as - AttachmentHandler::saveAs( tqparentWidget(), name, uid ); + AttachmentHandler::saveAs( parentWidget(), name, uid ); break; default: break; diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index 0e3da4bb5..c8bcfbcec 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -627,5 +627,5 @@ For security reasons, it is not recommended to store your password in the config <slot>slotChanged()</slot> </Q_SLOTS> <exportmacro>KDE_EXPORT</exportmacro> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/koincidencetooltip.cpp b/korganizer/koincidencetooltip.cpp index ca1e76721..e3ff30f5c 100644 --- a/korganizer/koincidencetooltip.cpp +++ b/korganizer/koincidencetooltip.cpp @@ -56,7 +56,7 @@ void KOIncidenceToolTip::add( KOAgendaItem *item, Calendar *calendar, void KOIncidenceToolTip::maybeTip(const TQPoint & pos) { Q_UNUSED( pos ); - KOAgendaItem *item = dynamic_cast<KOAgendaItem*>( tqparentWidget() ); + KOAgendaItem *item = dynamic_cast<KOAgendaItem*>( parentWidget() ); if ( !item ) return; if ( !mText ) diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index ce75b6543..09dc07dab 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -220,8 +220,8 @@ KOListView::KOListView( Calendar *calendar, mListView->addColumn( i18n("Categories") ); - TQBoxLayout *tqlayoutTop = new TQVBoxLayout( this ); - tqlayoutTop->addWidget( mListView ); + TQBoxLayout *layoutTop = new TQVBoxLayout( this ); + layoutTop->addWidget( mListView ); mPopupMenu = eventPopup(); /* diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index 271eee12e..4d2382917 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -66,10 +66,10 @@ typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory; K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory ) -KOrganizerPart::KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName, +KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & ) : - KParts::ReadOnlyPart(tqparent, name), mTopLevelWidget( tqparentWidget->tqtopLevelWidget() ) + KParts::ReadOnlyPart(tqparent, name), mTopLevelWidget( parentWidget->tqtopLevelWidget() ) { KGlobal::locale()->insertCatalogue( "libkcal" ); KGlobal::locale()->insertCatalogue( "libkdepim" ); @@ -80,7 +80,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName TQString pname( name ); // create a canvas to insert our widget - TQWidget *canvas = new TQWidget( tqparentWidget, widgetName ); + TQWidget *canvas = new TQWidget( parentWidget, widgetName ); canvas->setFocusPolicy( TQ_ClickFocus ); setWidget( canvas ); mView = new CalendarView( canvas ); diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index fb6584e19..a20485f29 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -59,7 +59,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart, Q_OBJECT TQ_OBJECT public: - KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName, + KOrganizerPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & ); virtual ~KOrganizerPart(); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 6fe060427..6b511f790 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -704,14 +704,14 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action) } else { // correctly update changes in relations Todo*tqparent = dynamic_cast<Todo*>( todo->relatedTo() ); - KOTodoViewItem*tqparentItem = 0; + KOTodoViewItem*parentItem = 0; if ( tqparent && mTodoMap.tqcontains(tqparent) ) { - tqparentItem = mTodoMap[ tqparent ]; + parentItem = mTodoMap[ tqparent ]; } - if ( todoItem->tqparent() != tqparentItem ) { + if ( todoItem->tqparent() != parentItem ) { // The relations changed - if ( tqparentItem ) { - tqparentItem->insertItem( todoItem ); + if ( parentItem ) { + parentItem->insertItem( todoItem ); } else { mTodoListView->insertItem( todoItem ); } diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui index 0b0d0efb9..bf8bf7ad6 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -193,7 +193,7 @@ <tabstop>mFromDate</tabstop> <tabstop>mToDate</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdateedit.h</includehint> <includehint>kdateedit.h</includehint> diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui index 2628c7a79..b27389b6c 100644 --- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui +++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui @@ -182,5 +182,5 @@ <tabstop>mFromDate</tabstop> <tabstop>mToDate</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui index bd416a856..c920d0b22 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -168,7 +168,7 @@ <tabstop>mFromDate</tabstop> <tabstop>mToDate</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdateedit.h</includehint> <includehint>kdateedit.h</includehint> diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui index 294cd590c..e0f52d6cb 100644 --- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui +++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui @@ -196,5 +196,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index d0d2db381..c559a6960 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -45,11 +45,11 @@ using namespace KOrg; -KOProjectViewItem::KOProjectViewItem(Todo *event,KGanttItem* tqparentTask, +KOProjectViewItem::KOProjectViewItem(Todo *event,KGanttItem* parentTask, const TQString& text, const TQDateTime& start, const TQDateTime& end) : - KGanttItem(tqparentTask,text,start,end) + KGanttItem(parentTask,text,start,end) { mEvent = event; } diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h index b71afbd0a..21aa4b2b0 100644 --- a/korganizer/plugins/projectview/koprojectview.h +++ b/korganizer/plugins/projectview/koprojectview.h @@ -46,7 +46,7 @@ class TQListView; */ class KOProjectViewItem : public KGanttItem { public: - KOProjectViewItem(Todo *,KGanttItem* tqparentTask, const TQString& text, + KOProjectViewItem(Todo *,KGanttItem* parentTask, const TQString& text, const TQDateTime& start, const TQDateTime& end); ~KOProjectViewItem(); diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui index 6dad9c039..9073176b8 100644 --- a/korganizer/printing/calprintdayconfig_base.ui +++ b/korganizer/printing/calprintdayconfig_base.ui @@ -249,7 +249,7 @@ <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>libkdepim/kdateedit.h</includehint> <includehint>libkdepim/kdateedit.h</includehint> diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui index a470859b7..68afdecb1 100644 --- a/korganizer/printing/calprintincidenceconfig_base.ui +++ b/korganizer/printing/calprintincidenceconfig_base.ui @@ -99,5 +99,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui index e09033c65..a6c5ba0e9 100644 --- a/korganizer/printing/calprintmonthconfig_base.ui +++ b/korganizer/printing/calprintmonthconfig_base.ui @@ -200,7 +200,7 @@ <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>knuminput.h</includehint> diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index d49860f18..63509d355 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -447,7 +447,7 @@ <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>libkdepim/kdateedit.h</includehint> <includehint>libkdepim/kdateedit.h</includehint> diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui index 1998a801d..49608e5b1 100644 --- a/korganizer/printing/calprintweekconfig_base.ui +++ b/korganizer/printing/calprintweekconfig_base.ui @@ -292,7 +292,7 @@ <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>libkdepim/kdateedit.h</includehint> <includehint>libkdepim/kdateedit.h</includehint> diff --git a/korganizer/publishdialog_base.ui b/korganizer/publishdialog_base.ui index ffefbbfc0..76efbe645 100644 --- a/korganizer/publishdialog_base.ui +++ b/korganizer/publishdialog_base.ui @@ -129,5 +129,5 @@ <tabstop>mRemove</tabstop> <tabstop>mSelectAddressee</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index cc6a8af9b..6c0bda0fd 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -372,8 +372,8 @@ void ResourceView::addResource() &ok, this ); if ( !ok ) return; - const TQString tqparentId = item->isSubresource() ? item->resourceIdentifier() : TQString:: null; - if ( !item->resource()->addSubresource( folderName, tqparentId ) ) { + const TQString parentId = item->isSubresource() ? item->resourceIdentifier() : TQString:: null; + if ( !item->resource()->addSubresource( folderName, parentId ) ) { KMessageBox::error( this, i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).tqarg( folderName ) ); diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui index 60b8aa1b7..db3402424 100644 --- a/korganizer/template_management_dialog_base.ui +++ b/korganizer/template_management_dialog_base.ui @@ -86,7 +86,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> </includehints> diff --git a/korn/ChangeLog b/korn/ChangeLog index d759fb3f3..e644587e3 100644 --- a/korn/ChangeLog +++ b/korn/ChangeLog @@ -27,7 +27,7 @@ 1999-06-23 Cristian Tibirna <[email protected]> * temporarily take care of korn (with Taj's blessing) - * fix most of the tqlayouts (/me being too stupid to fix Taj's nice + * fix most of the layouts (/me being too stupid to fix Taj's nice custom tqlayout classes, I switched completely to pure QLayouts) * fixed most of the i18n * made FileDialogs start with the current path by default (instead no diff --git a/korn/dockeditem.h b/korn/dockeditem.h index a80c17879..4500d8776 100644 --- a/korn/dockeditem.h +++ b/korn/dockeditem.h @@ -39,9 +39,9 @@ class DockedItem : public BoxContainerItem TQ_OBJECT public: /** - * This contructor gives all it parameters to its tqparents. + * This contructor gives all it parameters to its parents. * @param parant The tqparent window - * @param name The name of the TQObject's tqparents. + * @param name The name of the TQObject's parents. */ DockedItem( TQWidget * tqparent = 0, const char * name = 0 ); /** diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index bc47e9e77..fa4190d3e 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -46,7 +46,7 @@ HVItem::HVItem( TQWidget *tqparent, const char *name ) HVItem::~HVItem() { - //Let everything be deleted by his tqparents. + //Let everything be deleted by his parents. } void HVItem::showBox() diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui index 9152c3af4..9a640718e 100644 --- a/korn/kornaccountcfg.ui +++ b/korn/kornaccountcfg.ui @@ -237,7 +237,7 @@ <Q_SLOTS> <slot access="protected">slotProtocolChanged( const TQString& )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index f12cf606a..3d9ca6092 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -1677,7 +1677,7 @@ <slot access="protected">slotNormalAnimToggled( bool )</slot> <slot access="protected">slotNewAnimToggled( bool )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/korn/korncfg.ui b/korn/korncfg.ui index baa766dd8..8707cecc6 100644 --- a/korn/korncfg.ui +++ b/korn/korncfg.ui @@ -172,5 +172,5 @@ <slot access="protected">slotSetDefaults( const TQString&, const int, KConfig* )</slot> <slot access="protected">slotEditBox()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui index c5d93ce1f..e56703418 100644 --- a/korn/progress_dialog.ui +++ b/korn/progress_dialog.ui @@ -116,5 +116,5 @@ <slot>setProgress( int number )</slot> <slot access="private" specifier="non virtual">cancelbutton()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index 333021c52..593ea212b 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -61,7 +61,7 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *tqparent ) setModal( true ); // The dialog contains a list view and several buttons. - // Two box tqlayouts hol dthem. + // Two box layouts hol dthem. TQWidget * page = new TQWidget( this ); setMainWidget(page); invertSelButton = new KPushButton(i18n("&Invert Selection"), page); diff --git a/korn/systemtray.h b/korn/systemtray.h index 6338ae57e..54fba1a4f 100644 --- a/korn/systemtray.h +++ b/korn/systemtray.h @@ -34,9 +34,9 @@ class SystemTray : public KSystemTray TQ_OBJECT public: /** - * This contructor gives all it parameters to its tqparents. + * This contructor gives all it parameters to its parents. * @param parant The tqparent window - * @param name The name of the TQObject's tqparents. + * @param name The name of the TQObject's parents. */ SystemTray( TQWidget * tqparent = 0, const char * name = 0 ); /** diff --git a/kresources/blogging/resourcebloggingsettings.ui b/kresources/blogging/resourcebloggingsettings.ui index de8a0bafc..917933cee 100644 --- a/kresources/blogging/resourcebloggingsettings.ui +++ b/kresources/blogging/resourcebloggingsettings.ui @@ -313,7 +313,7 @@ <tabstop>mOpenCategory</tabstop> <tabstop>mCloseCategory</tabstop> </tabstops> -<tqlayoutdefaults spacing="5" margin="5"/> +<layoutdefaults spacing="5" margin="5"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp index c86cdd1ab..dbab62d7f 100644 --- a/kresources/caldav/config.cpp +++ b/kresources/caldav/config.cpp @@ -190,7 +190,7 @@ void ResourceCalDavConfig::setupUI() { label->hide(); mPassword->hide(); - // combining tqlayouts + // combining layouts vertical->addLayout(mainLayout); vertical->addLayout(horizontal); } diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp index a33519c9d..70a3caf12 100644 --- a/kresources/carddav/config.cpp +++ b/kresources/carddav/config.cpp @@ -158,7 +158,7 @@ void ResourceCardDavConfig::setupUI() { label->hide(); mPassword->hide(); - // combining tqlayouts + // combining layouts vertical->addLayout(mainLayout); vertical->addLayout(horizontal); } diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp index b15a5a395..177ce9def 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp @@ -1114,8 +1114,8 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args ) // SUBTODO Incidence *inc = todo->relatedTo(); if ( inc ) { - TQString tqparentUid = idMapper().remoteId( inc->uid() ); - args.insert( "id_tqparent", tqparentUid ); + TQString parentUid = idMapper().remoteId( inc->uid() ); + args.insert( "id_tqparent", parentUid ); } // STATE @@ -1172,9 +1172,9 @@ void ResourceXMLRPC::readTodo( const TQMap<TQString, TQVariant>& args, Todo *tod } // SUBTODO - TQString tqparentId = args[ "id_tqparent" ].toString(); - if ( tqparentId != "0" ) { // we are a sub todo - TQString localParentUid = idMapper().localId( tqparentId ); + TQString parentId = args[ "id_tqparent" ].toString(); + if ( parentId != "0" ) { // we are a sub todo + TQString localParentUid = idMapper().localId( parentId ); if ( !localParentUid.isEmpty() ) { // found tqparent todo Todo *tqparent = mCalendar.todo( localParentUid ); if ( tqparent ) diff --git a/kresources/groupwise/groupwisesettingswidgetbase.ui b/kresources/groupwise/groupwisesettingswidgetbase.ui index 732b296be..49437ef4c 100644 --- a/kresources/groupwise/groupwisesettingswidgetbase.ui +++ b/kresources/groupwise/groupwisesettingswidgetbase.ui @@ -73,7 +73,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp index e9e05c26e..c07708799 100644 --- a/kresources/groupwise/soap/ksslsocket.cpp +++ b/kresources/groupwise/soap/ksslsocket.cpp @@ -280,8 +280,8 @@ int KSSLSocket::verifyCertificate() } // Since we're the tqparent, we need to teach the child. - setMetaData("ssl_tqparent_ip", ourIp ); - setMetaData("ssl_tqparent_cert", pc.toString()); + setMetaData("ssl_parent_ip", ourIp ); + setMetaData("ssl_parent_cert", pc.toString()); // - Read from cache and see if there is a policy for this KSSLCertificateCache::KSSLCertificatePolicy cp = d->cc->getPolicyByCertificate(pc); diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp index 872e9b4a4..7bf5a601c 100644 --- a/kresources/kolab/kcal/task.cpp +++ b/kresources/kolab/kcal/task.cpp @@ -136,9 +136,9 @@ KCal::Incidence::tqStatus Task::status() const return mtqStatus; } -void Task::setParent( const TQString& tqparentUid ) +void Task::setParent( const TQString& parentUid ) { - mParent = tqparentUid; + mParent = parentUid; } TQString Task::tqparent() const diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h index 624605a29..5990192b9 100644 --- a/kresources/kolab/kcal/task.h +++ b/kresources/kolab/kcal/task.h @@ -80,7 +80,7 @@ public: virtual void setqStatus( KCal::Incidence::tqStatus status ); virtual KCal::Incidence::tqStatus status() const; - virtual void setParent( const TQString& tqparentUid ); + virtual void setParent( const TQString& parentUid ); virtual TQString tqparent() const; virtual void setHasStartDate( bool ); diff --git a/kresources/slox/sloxfolder.cpp b/kresources/slox/sloxfolder.cpp index 0430f8eeb..fbfb9f051 100644 --- a/kresources/slox/sloxfolder.cpp +++ b/kresources/slox/sloxfolder.cpp @@ -21,10 +21,10 @@ #include "sloxfolder.h" -SloxFolder::SloxFolder( const TQString &id, const TQString &tqparentId, const TQString &type, const TQString &name, bool def ) : +SloxFolder::SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def ) : item( 0 ), mId( id ), - mParentId( tqparentId ), + mParentId( parentId ), mName( name ), mDefault( def ) { diff --git a/kresources/slox/sloxfolder.h b/kresources/slox/sloxfolder.h index 967f83eda..e27399a66 100644 --- a/kresources/slox/sloxfolder.h +++ b/kresources/slox/sloxfolder.h @@ -35,10 +35,10 @@ enum FolderType { class KDE_EXPORT SloxFolder { public: - SloxFolder( const TQString &id, const TQString &tqparentId, const TQString &type, const TQString &name, bool def = false ); + SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def = false ); TQString id() const { return mId; } - TQString tqparentId() const { return mParentId; } + TQString parentId() const { return mParentId; } FolderType type() const { return mType; } TQString name() const; bool isDefault() const { return mDefault; } diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp index acf871b2f..d58a18e1d 100644 --- a/kresources/slox/sloxfolderdialog.cpp +++ b/kresources/slox/sloxfolderdialog.cpp @@ -70,8 +70,8 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder ) return; if ( folder->type() != mFolderType && folder->type() != Unbound ) return; - if( mManager->folders().tqcontains( folder->tqparentId() ) ) { - SloxFolder *tqparent = mManager->folders()[folder->tqparentId()]; + if( mManager->folders().tqcontains( folder->parentId() ) ) { + SloxFolder *tqparent = mManager->folders()[folder->parentId()]; createFolderViewItem( tqparent ); if ( tqparent->item ) folder->item = new KListViewItem( tqparent->item ); diff --git a/kresources/slox/sloxfoldermanager.cpp b/kresources/slox/sloxfoldermanager.cpp index b5fd39585..7894ec93a 100644 --- a/kresources/slox/sloxfoldermanager.cpp +++ b/kresources/slox/sloxfoldermanager.cpp @@ -136,7 +136,7 @@ void SloxFolderManager::readFolders() TQDomNodeList nodes = doc.elementsByTagName( "D:prop" ); for( uint i = 0; i < nodes.count(); ++i ) { TQDomElement element = nodes.item(i).toElement(); - TQString id = "-1", tqparentId = "-1"; // OX default folder + TQString id = "-1", parentId = "-1"; // OX default folder bool def = false; TQString name, type; TQDomNode n; @@ -145,13 +145,13 @@ void SloxFolderManager::readFolders() TQString tag = e.tagName(); TQString value = e.text(); if ( tag == "ox:object_id" ) id = value; - else if ( tag == "ox:folder_id" ) tqparentId = value; + else if ( tag == "ox:folder_id" ) parentId = value; else if ( tag == "ox:title" ) name = value; else if ( tag == "ox:module" ) type = value; else if ( tag == "ox:defaultfolder" ) def = (value == "true"); } - if ( id != "-1" && tqparentId != "-1" ) { - SloxFolder *folder = new SloxFolder( id, tqparentId, type, name, def ); + if ( id != "-1" && parentId != "-1" ) { + SloxFolder *folder = new SloxFolder( id, parentId, type, name, def ); mFolders[id] = folder; kdDebug() << k_funcinfo << "Found folder: " << folder->name() << endl; } diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui index 0b787ab9b..808df4e71 100644 --- a/ktnef/gui/attachpropertydialogbase.ui +++ b/ktnef/gui/attachpropertydialogbase.ui @@ -274,7 +274,7 @@ <Q_SLOTS> <slot access="protected">saveClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp index f5c35c17f..78de8f8de 100644 --- a/libemailfunctions/email.cpp +++ b/libemailfunctions/email.cpp @@ -32,7 +32,7 @@ TQStringList KPIM::splitEmailAddrList(const TQString& aStr) { // Features: // - always ignores quoted characters - // - ignores everything (including tqparentheses and commas) + // - ignores everything (including parentheses and commas) // inside quoted strings // - supports nested comments // - ignores everything (including double quotes and commas) @@ -729,12 +729,12 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail) // and outside of quoted text behind the trailing '>'. bInComment = false; bInQuotesOutsideOfEmail = false; - int tqparenthesesNesting = 0; + int parenthesesNesting = 0; for( i = iAd+1; len > i; ++i ) { c = aStr[i]; if( bInComment ){ if( ')' == c ){ - if ( --tqparenthesesNesting == 0 ) { + if ( --parenthesesNesting == 0 ) { bInComment = false; if( !name.isEmpty() ) name.append( ' ' ); @@ -745,7 +745,7 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail) } else { if( '(' == c ) { // nested "(" - ++tqparenthesesNesting; + ++parenthesesNesting; } name.append( c ); // all comment stuff is part of the name } @@ -772,7 +772,7 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail) case '(': if( !name.isEmpty() ) name.append( ' ' ); - if ( ++tqparenthesesNesting > 0 ) + if ( ++parenthesesNesting > 0 ) bInComment = true; break; default: diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp index 432334e1b..90a6a862e 100644 --- a/libemailfunctions/tests/testemail.cpp +++ b/libemailfunctions/tests/testemail.cpp @@ -183,10 +183,10 @@ int main(int argc, char *argv[]) checkGetNameAndEmail( "(David Faure) [email protected]", "David Faure", "[email protected]", true ); checkGetNameAndEmail( "My Name (me) <[email protected]>", "My Name (me)", "[email protected]", true ); // #93513 - // Nested tqparenthesis as per https://intevation.de/roundup/kolab/issue858 + // Nested parenthesis as per https://intevation.de/roundup/kolab/issue858 checkGetNameAndEmail( "[email protected] (David (The Man) Faure)", "David (The Man) Faure", "[email protected]", true ); - // Double-quotes inside tqparenthesis + // Double-quotes inside parenthesis checkGetNameAndEmail( "[email protected] (David \"Crazy\" Faure)", "David \"Crazy\" Faure", "[email protected]", true ); checkGetNameAndEmail( "(David \"Crazy\" Faure) [email protected]", "David \"Crazy\" Faure", "[email protected]", true ); diff --git a/libkcal/COPYING b/libkcal/COPYING index 5c8730e0f..21e21126c 100644 --- a/libkcal/COPYING +++ b/libkcal/COPYING @@ -250,7 +250,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure tqlayouts and accessors, and small macros and small inline +structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index 9d9b63f4e..a5f919324 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -475,12 +475,12 @@ bool Calendar::deleteIncidence( Incidence *incidence ) if ( beginChange( incidence ) ) { if (incidence->hasRecurrenceID()) { // Delete this event's UID from the tqparent's list of tqchildren - Incidence *tqparentIncidence; + Incidence *parentIncidence; IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; it = il.begin(); - tqparentIncidence = this->incidence(*it); - tqparentIncidence->deleteChildIncidence(incidence->uid()); + parentIncidence = this->incidence(*it); + parentIncidence->deleteChildIncidence(incidence->uid()); } else { // Delete all tqchildren as well diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp index fd1ef20d3..9ebae51d4 100644 --- a/libkcal/dndfactory.cpp +++ b/libkcal/dndfactory.cpp @@ -216,7 +216,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime } // All pasted incidences get new uids, must keep track of old uids, - // so we can update child's tqparents + // so we can update child's parents TQMap<TQString,Incidence*> oldUidToNewInc; Incidence::List::ConstIterator it; @@ -233,9 +233,9 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime for ( it = list.constBegin(); it != list.constEnd(); ++it ) { Incidence *inc = *it; if ( oldUidToNewInc.tqcontains( inc->relatedToUid() ) ) { - Incidence *tqparentInc = oldUidToNewInc[inc->relatedToUid()]; - inc->setRelatedToUid( tqparentInc->uid() ); - inc->setRelatedTo( tqparentInc ); + Incidence *parentInc = oldUidToNewInc[inc->relatedToUid()]; + inc->setRelatedToUid( parentInc->uid() ); + inc->setRelatedTo( parentInc ); } else { // not related to anything in the clipboard inc->setRelatedToUid( TQString() ); diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index ce3f8002f..c427b0df2 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -304,9 +304,9 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar ) IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; it = il.begin(); - Incidence *tqparentIncidence; - tqparentIncidence = calendar->incidence(*it); - il = tqparentIncidence->childIncidences(); + Incidence *parentIncidence; + parentIncidence = calendar->incidence(*it); + il = parentIncidence->childIncidences(); if (il.count() > 0) { for ( it = il.begin(); it != il.end(); ++it ) { component = mImpl->writeIncidence( calendar->incidence(*it) ); @@ -314,7 +314,7 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar ) icalcomponent_free( component ); } } - component = mImpl->writeIncidence( tqparentIncidence ); + component = mImpl->writeIncidence( parentIncidence ); text = text + TQString::fromUtf8( icalcomponent_as_ical_string( component ) ); icalcomponent_free( component ); } diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index 09d1eef7b..82732bab1 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -523,10 +523,10 @@ void ResourceCached::calendarIncidenceDeleted( Incidence *i ) IncidenceList il = i->childIncidences(); IncidenceListIterator it; it = il.begin(); - Incidence *tqparentIncidence; - tqparentIncidence = this->incidence(*it); + Incidence *parentIncidence; + parentIncidence = this->incidence(*it); // Remove the child - calendarIncidenceChanged(tqparentIncidence); + calendarIncidenceChanged(parentIncidence); } else { TQMap<Incidence *,bool>::ConstIterator it; diff --git a/libkdenetwork/libgpg-error-copy/err-codes.h.in b/libkdenetwork/libgpg-error-copy/err-codes.h.in index d9bef00c9..167de9c75 100644 --- a/libkdenetwork/libgpg-error-copy/err-codes.h.in +++ b/libkdenetwork/libgpg-error-copy/err-codes.h.in @@ -213,7 +213,7 @@ 201 GPG_ERR_SEXP_INV_LEN_SPEC Invalid length specifier in S-expression 202 GPG_ERR_SEXP_STRING_TOO_LONG String too long in S-expression -203 GPG_ERR_SEXP_UNMATCHED_PAREN Unmatched tqparentheses in S-expression +203 GPG_ERR_SEXP_UNMATCHED_PAREN Unmatched parentheses in S-expression 204 GPG_ERR_SEXP_NOT_CANONICAL S-expression not canonical 205 GPG_ERR_SEXP_BAD_CHARACTER Bad character in S-expression 206 GPG_ERR_SEXP_BAD_TQUOTATION Bad quotation in S-expression diff --git a/libkdenetwork/libgpg-error-copy/gettext.h b/libkdenetwork/libgpg-error-copy/gettext.h index fdb2511c0..0cae5f458 100644 --- a/libkdenetwork/libgpg-error-copy/gettext.h +++ b/libkdenetwork/libgpg-error-copy/gettext.h @@ -68,7 +68,7 @@ translation is done at a different place in the code. The argument, String, should be a literal string. Concatenated strings and other string expressions won't work. - The macro's expansion is not tqparenthesized, so that it is suitable as + The macro's expansion is not parenthesized, so that it is suitable as initializer for static 'char[]' or 'const char[]' variables. */ #define gettext_noop(String) String diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c index ebae5ea38..a4dc17add 100644 --- a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c +++ b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c @@ -325,7 +325,7 @@ pipe_connect_unix (assuan_context_t *ctx, } errno = 0; - /* We store our tqparents pid in the environment so that the + /* We store our parents pid in the environment so that the execed assuan server is able to read the actual pid of the client. The server can't use getppid because it might have been double forked before the assuan server has been @@ -493,7 +493,7 @@ socketpair_connect (assuan_context_t *ctx, } errno = 0; - /* We store our tqparents pid in the environment so that the + /* We store our parents pid in the environment so that the execed assuan server is able to read the actual pid of the client. The server can't use getppid becuase it might have been double forked before the assuan server has been diff --git a/libkdenetwork/libgpgme-copy/gpgme/io.h b/libkdenetwork/libgpgme-copy/gpgme/io.h index cd0a47070..33dc5d9a1 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/io.h +++ b/libkdenetwork/libgpgme-copy/gpgme/io.h @@ -54,7 +54,7 @@ int _gpgme_io_set_nonblocking (int fd); fds in FD_CHILD_LIST in the child. */ int _gpgme_io_spawn (const char *path, char **argv, struct spawn_fd_item_s *fd_child_list, - struct spawn_fd_item_s *fd_tqparent_list); + struct spawn_fd_item_s *fd_parent_list); int _gpgme_io_waitpid (int pid, int hang, int *r_status, int *r_signal); int _gpgme_io_kill (int pid, int hard); int _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock); diff --git a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c index 5be777401..3c9fa4b13 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c +++ b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c @@ -212,7 +212,7 @@ _gpgme_io_waitpid (int pid, int hang, int *r_status, int *r_signal) int _gpgme_io_spawn (const char *path, char **argv, struct spawn_fd_item_s *fd_child_list, - struct spawn_fd_item_s *fd_tqparent_list) + struct spawn_fd_item_s *fd_parent_list) { pid_t pid; int i; @@ -300,8 +300,8 @@ _gpgme_io_spawn (const char *path, char **argv, return -1; /* .dup_to is not used in the tqparent list. */ - for (i = 0; fd_tqparent_list[i].fd != -1; i++) - _gpgme_io_close (fd_tqparent_list[i].fd); + for (i = 0; fd_parent_list[i].fd != -1; i++) + _gpgme_io_close (fd_parent_list[i].fd); return 0; } diff --git a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h index a64f1467d..1d05ba03f 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h +++ b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h @@ -56,7 +56,7 @@ int _gpgme_io_set_nonblocking (int fd); fds in FD_CHILD_LIST in the child. */ int _gpgme_io_spawn (const char *path, char **argv, struct spawn_fd_item_s *fd_child_list, - struct spawn_fd_item_s *fd_tqparent_list); + struct spawn_fd_item_s *fd_parent_list); int _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock); /* Write the printable version of FD to the buffer BUF of length diff --git a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c index 42fff0032..1a25dac00 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c +++ b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c @@ -1211,7 +1211,7 @@ start (engine_gpg_t gpg) int saved_errno; int i, n; int status; - struct spawn_fd_item_s *fd_child_list, *fd_tqparent_list; + struct spawn_fd_item_s *fd_child_list, *fd_parent_list; if (!gpg) return gpg_error (GPG_ERR_INV_VALUE); @@ -1247,7 +1247,7 @@ start (engine_gpg_t gpg) fd_child_list = calloc (n + n, sizeof *fd_child_list); if (!fd_child_list) return gpg_error_from_errno (errno); - fd_tqparent_list = fd_child_list + n; + fd_parent_list = fd_child_list + n; /* build the fd list for the child */ n = 0; @@ -1273,28 +1273,28 @@ start (engine_gpg_t gpg) n = 0; if (gpg->status.fd[1] != -1) { - fd_tqparent_list[n].fd = gpg->status.fd[1]; - fd_tqparent_list[n].dup_to = -1; + fd_parent_list[n].fd = gpg->status.fd[1]; + fd_parent_list[n].dup_to = -1; n++; } if (gpg->colon.fd[1] != -1) { - fd_tqparent_list[n].fd = gpg->colon.fd[1]; - fd_tqparent_list[n].dup_to = -1; + fd_parent_list[n].fd = gpg->colon.fd[1]; + fd_parent_list[n].dup_to = -1; n++; } for (i = 0; gpg->fd_data_map[i].data; i++) { - fd_tqparent_list[n].fd = gpg->fd_data_map[i].peer_fd; - fd_tqparent_list[n].dup_to = -1; + fd_parent_list[n].fd = gpg->fd_data_map[i].peer_fd; + fd_parent_list[n].dup_to = -1; n++; } - fd_tqparent_list[n].fd = -1; - fd_tqparent_list[n].dup_to = -1; + fd_parent_list[n].fd = -1; + fd_parent_list[n].dup_to = -1; status = _gpgme_io_spawn (gpg->file_name ? gpg->file_name : _gpgme_get_gpg_path (), - gpg->argv, fd_child_list, fd_tqparent_list); + gpg->argv, fd_child_list, fd_parent_list); saved_errno = errno; free (fd_child_list); if (status == -1) diff --git a/libkdenetwork/libgpgme-copy/gpgme/w32-io.c b/libkdenetwork/libgpgme-copy/gpgme/w32-io.c index 9625178ae..677c14e30 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/w32-io.c +++ b/libkdenetwork/libgpgme-copy/gpgme/w32-io.c @@ -857,7 +857,7 @@ build_commandline (char **argv) int _gpgme_io_spawn ( const char *path, char **argv, struct spawn_fd_item_s *fd_child_list, - struct spawn_fd_item_s *fd_tqparent_list ) + struct spawn_fd_item_s *fd_parent_list ) { SECURITY_ATTRIBUTES sec_attr; PROCESS_INFORMATION pi = { @@ -966,8 +966,8 @@ _gpgme_io_spawn ( const char *path, char **argv, } /* Close the other ends of the pipes. */ - for (i = 0; fd_tqparent_list[i].fd != -1; i++) - _gpgme_io_close (fd_tqparent_list[i].fd); + for (i = 0; fd_parent_list[i].fd != -1; i++) + _gpgme_io_close (fd_parent_list[i].fd); DEBUG4 ("CreateProcess ready\n" "- hProcess=%p hThread=%p\n" diff --git a/libkdepim/addresspicker.ui b/libkdepim/addresspicker.ui index fa826ff5d..fc88d52a0 100644 --- a/libkdepim/addresspicker.ui +++ b/libkdepim/addresspicker.ui @@ -315,7 +315,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/libkdepim/categoryeditdialog_base.ui b/libkdepim/categoryeditdialog_base.ui index a4bfdbf5b..11cd98740 100644 --- a/libkdepim/categoryeditdialog_base.ui +++ b/libkdepim/categoryeditdialog_base.ui @@ -103,5 +103,5 @@ <tabstop>mButtonAdd</tabstop> <tabstop>mButtonRemove</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkdepim/categoryselectdialog_base.ui b/libkdepim/categoryselectdialog_base.ui index 63162b685..1e45bd468 100644 --- a/libkdepim/categoryselectdialog_base.ui +++ b/libkdepim/categoryselectdialog_base.ui @@ -97,5 +97,5 @@ <tabstop>mButtonClear</tabstop> <tabstop>mButtonEdit</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkdepim/cfgc/general_base.ui b/libkdepim/cfgc/general_base.ui index b8bc91c08..7cafaa011 100644 --- a/libkdepim/cfgc/general_base.ui +++ b/libkdepim/cfgc/general_base.ui @@ -42,5 +42,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkdepim/cfgc/myoptions_base.ui b/libkdepim/cfgc/myoptions_base.ui index 944b6c629..4d4f8247f 100644 --- a/libkdepim/cfgc/myoptions_base.ui +++ b/libkdepim/cfgc/myoptions_base.ui @@ -42,5 +42,5 @@ </property> </widget> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkdepim/kfoldertree.cpp b/libkdepim/kfoldertree.cpp index 48398ddca..69111d559 100644 --- a/libkdepim/kfoldertree.cpp +++ b/libkdepim/kfoldertree.cpp @@ -269,7 +269,7 @@ void KFolderTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, // deal with the folder column if the unread column is not shown /* The below is exceedingly silly, but Ingo insists that the unread - * count that is shown in tqparenthesis after the folder name must + * count that is shown in parenthesis after the folder name must * be configurable in color. That means that paintCell needs to do * two painting passes which flickers. Since that flicker is not * needed when there is the unread column, special case that. */ diff --git a/libkdepim/komposer/core/core.h b/libkdepim/komposer/core/core.h index 871d67a05..91487572a 100644 --- a/libkdepim/komposer/core/core.h +++ b/libkdepim/komposer/core/core.h @@ -47,7 +47,7 @@ namespace Komposer Q_OBJECT TQ_OBJECT public: - Core( TQWidget *tqparentWidget = 0, const char *name = 0 ); + Core( TQWidget *parentWidget = 0, const char *name = 0 ); virtual ~Core(); public slots: diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp index 110168904..16cb61bbb 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp @@ -26,8 +26,8 @@ #include <kapplication.h> #include <kdepimmacros.h> -KPartsGenericPart::KPartsGenericPart( TQWidget* tqparentWidget, const char* name ) - : TQWidget( tqparentWidget, name ), m_part( 0 ) +KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) + : TQWidget( parentWidget, name ), m_part( 0 ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h index 0a37f2f80..e87b8d019 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h @@ -35,7 +35,7 @@ class KPartsGenericPart : public TQWidget { TQ_PROPERTY( TQString url READ url WRITE setURL ) TQ_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype ) public: - KPartsGenericPart( TQWidget* tqparentWidget, const char* name ); + KPartsGenericPart( TQWidget* parentWidget, const char* name ); TQString url() const { return m_url; } void setURL( const TQString& url ) { m_url = url; load(); } diff --git a/libkdepim/ksubscription.cpp b/libkdepim/ksubscription.cpp index a17ae8410..512ef3453 100644 --- a/libkdepim/ksubscription.cpp +++ b/libkdepim/ksubscription.cpp @@ -448,7 +448,7 @@ void KSubscription::changeItemState( GroupItem* item, bool on ) TQListViewItem *p = item->tqparent(); while (p) { - // make sure all tqparents are subscribed + // make sure all parents are subscribed GroupItem* pi = static_cast<GroupItem*>(p); if (pi->isCheckItem() && !pi->isOn()) { diff --git a/libkdepim/overlaywidget.cpp b/libkdepim/overlaywidget.cpp index 77ce34108..209b8c429 100644 --- a/libkdepim/overlaywidget.cpp +++ b/libkdepim/overlaywidget.cpp @@ -52,8 +52,8 @@ void OverlayWidget::reposition() p.setY( -height() ); // Position in the toplevelwidget's coordinates TQPoint pTopLevel = mAlignWidget->mapTo( tqtopLevelWidget(), p ); - // Position in the widget's tqparentWidget coordinates - TQPoint pParent = tqparentWidget()->mapFrom( tqtopLevelWidget(), pTopLevel ); + // Position in the widget's parentWidget coordinates + TQPoint pParent = parentWidget()->mapFrom( tqtopLevelWidget(), pTopLevel ); // Move 'this' to that position. move( pParent ); } diff --git a/libkdepim/progressdialog.cpp b/libkdepim/progressdialog.cpp index 2788afe21..580830dec 100644 --- a/libkdepim/progressdialog.cpp +++ b/libkdepim/progressdialog.cpp @@ -87,16 +87,16 @@ void TransactionItemView::resizeContents( int w, int h ) // Tell the tqlayout in the tqparent (progressdialog) that our size changed updateGeometry(); // Resize the tqparent (progressdialog) - this works but resize horizontally too often - //tqparentWidget()->adjustSize(); + //parentWidget()->adjustSize(); TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted ); TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); - TQSize sz = tqparentWidget()->tqsizeHint(); - int currentWidth = tqparentWidget()->width(); + TQSize sz = parentWidget()->tqsizeHint(); + 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 ) currentWidth = sz.width(); - tqparentWidget()->resize( currentWidth, sz.height() ); + parentWidget()->resize( currentWidth, sz.height() ); } TQSize TransactionItemView::tqsizeHint() const diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h index 745e69a29..3edffd0d5 100644 --- a/libkdepim/progressmanager.h +++ b/libkdepim/progressmanager.h @@ -260,7 +260,7 @@ signals: * one with that id, there will not be a new one created but the existing * one will be returned. This is convenient for accessing items that are * needed regularly without the to store a pointer to them or to add child - * items to tqparents by id. + * items to parents by id. */ class KDE_EXPORT ProgressManager : public TQObject @@ -311,7 +311,7 @@ class KDE_EXPORT ProgressManager : public TQObject * @param canBeCanceled can the user cancel this operation? * @param usesCrypto does the operation use secure transports (SSL) * Cancelling the tqparent will cancel the tqchildren as well (if they can be - * cancelled) and ongoing tqchildren prevent tqparents from finishing. + * cancelled) and ongoing tqchildren prevent parents from finishing. * @return The ProgressItem representing the operation. */ static ProgressItem * createProgressItem( ProgressItem* tqparent, diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp index 5f31fe5ac..b9ad4d63d 100644 --- a/libkpgp/kpgpbase.cpp +++ b/libkpgp/kpgpbase.cpp @@ -269,7 +269,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) output += str; } else { /* - * Aptqparently, on NetBSD when the child dies, the pipe begins + * Apparently, on NetBSD when the child dies, the pipe begins * receiving empty data packets *before* waitpid() has signaled * that the child has died. Also, notice that this happens * without any error bit being set in pollfd.revents (is this a @@ -313,7 +313,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) error += str; } else { /* - * Aptqparently, on NetBSD when the child dies, the pipe begins + * Apparently, on NetBSD when the child dies, the pipe begins * receiving empty data packets *before* waitpid() has signaled * that the child has died. Also, notice that this happens * without any error bit being set in pollfd.revents (is this a @@ -547,7 +547,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) else { // FreeBSD/NetBSD workaround // - // Aptqparently, on Free/NetBSD when the child dies, the pipe begins + // Apparently, on Free/NetBSD when the child dies, the pipe begins // receiving empty data packets *before* waitpid() has signaled // that the child has died. Also, notice that this happens // without any error bit being set in pollfd.revents (is this a diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 5984c8764..eccc58e15 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -1660,7 +1660,7 @@ void CipherTextDialog::setMinimumSize() #if KDE_IS_VERSION( 3, 1, 90 ) - int maxWidth = KGlobalSettings::desktopGeometry(tqparentWidget()).width()-100; + int maxWidth = KGlobalSettings::desktopGeometry(parentWidget()).width()-100; #else KConfig gc("kdeglobals", false, false); gc.setGroup("Windows"); @@ -1668,7 +1668,7 @@ void CipherTextDialog::setMinimumSize() if (TQApplication::desktop()->isVirtualDesktop() && gc.readBoolEntry("XineramaEnabled", true) && gc.readBoolEntry("XineramaPlacementEnabled", true)) { - maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(tqparentWidget())).width()-100; + maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(parentWidget())).width()-100; } else { maxWidth = TQApplication::desktop()->tqgeometry().width()-100; } diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp index a673e5675..a33c98466 100644 --- a/libkpimidentities/identitycombo.cpp +++ b/libkpimidentities/identitycombo.cpp @@ -117,7 +117,7 @@ void IdentityCombo::slotIdentityManagerChanged() { blockSignals( false ); if ( idx < 0 ) - // aptqparently our oldIdentity got deleted: + // apparently our oldIdentity got deleted: slotEmitChanged( currentItem() ); } diff --git a/mimelib/Tutorial b/mimelib/Tutorial index 25c139ed9..2833dd033 100644 --- a/mimelib/Tutorial +++ b/mimelib/Tutorial @@ -278,7 +278,7 @@ following simple example shows how to accomplish this. cout << fullName << '\n'; } else { - // Aptqparently, there is no full name, so use the email + // Apparently, there is no full name, so use the email // address cout << mb->LocalPart() << '@' << mb->Domain() << '\n'; } diff --git a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui index cbee65c6e..e1cf1988e 100644 --- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui +++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui @@ -77,8 +77,8 @@ <includes> <include location="global" impldecl="in declaration">libkdepim/addresseelineedit.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="0"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="0"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> |