diff options
1630 files changed, 6423 insertions, 6423 deletions
diff --git a/NewsLog.txt b/NewsLog.txt index e0a0e81da..94229c5e3 100644 --- a/NewsLog.txt +++ b/NewsLog.txt @@ -1696,10 +1696,10 @@ Problems addressed * kolab/issue2142 ( part 1 ) Make sure the file selector is shown on top of the filter dialog. (732794) * crash when there is no smime backend, and the protocol can't be determined.(733049 ) * kolab/issue2151 Fix creation of new folders when restarting KMail before the next sync. ( 733149 ) -* kolab/issue2142 ( part 2 ) Provide a proper tqparent for the "ask to overwrite" dialog.(733495) +* kolab/issue2142 ( part 2 ) Provide a proper parent for the "ask to overwrite" dialog.(733495) * kolab/issue 2176 Move transaction code into the filtermanager, from the caller and make sure filter counts are written to and read from the right section. ( 733511 ) * kolab/issue2175 Show an error message if the to-be-imported filters file can't be read. (733519 ) -* kolab/issue2181 Fix crash when opening a message without a tqparent, cleanup initialization order.(734247) +* kolab/issue2181 Fix crash when opening a message without a parent, cleanup initialization order.(734247) New functionality ------------------- diff --git a/akregator/src/actionmanager.cpp b/akregator/src/actionmanager.cpp index 5598457aa..2dcdeb59f 100644 --- a/akregator/src/actionmanager.cpp +++ b/akregator/src/actionmanager.cpp @@ -43,7 +43,7 @@ void ActionManager::setInstance(ActionManager* manager) } -ActionManager::ActionManager(TQObject* tqparent, const char* name) : TQObject(tqparent, name), d(new ActionManagerPrivate) +ActionManager::ActionManager(TQObject* parent, const char* name) : TQObject(parent, name), d(new ActionManagerPrivate) {} ActionManager::~ActionManager() diff --git a/akregator/src/actionmanager.h b/akregator/src/actionmanager.h index bcdba56bc..9a41c4d58 100644 --- a/akregator/src/actionmanager.h +++ b/akregator/src/actionmanager.h @@ -43,7 +43,7 @@ class ActionManager : public TQObject static ActionManager* getInstance(); static void setInstance(ActionManager* manager); - ActionManager(TQObject* tqparent=0, const char* name=0); + ActionManager(TQObject* parent=0, const char* name=0); virtual ~ActionManager(); virtual KAction* action(const char* name, const char* classname=0) = 0; diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index b8c946694..827d1a95e 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -89,7 +89,7 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor { KAction* remove = m_manager->action("feed_remove"); if (remove) - remove->setEnabled(node->tqparent()); // root nodes must not be deleted + remove->setEnabled(node->parent()); // root nodes must not be deleted KAction* hp = m_manager->action("feed_homepage"); if (hp) hp->setEnabled(false); @@ -222,7 +222,7 @@ void ActionManagerImpl::slotNodeSelected(TreeNode* node) d->nodeSelectVisitor->visit(node); } -ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* tqparent, const char* name) : ActionManager(tqparent, name), d(new ActionManagerImplPrivate) +ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* parent, const char* name) : ActionManager(parent, name), d(new ActionManagerImplPrivate) { d->nodeSelectVisitor = new NodeSelectVisitor(this); d->part = part; diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h index 398135c64..3b63ab95e 100644 --- a/akregator/src/actionmanagerimpl.h +++ b/akregator/src/actionmanagerimpl.h @@ -53,7 +53,7 @@ class ActionManagerImpl : public ActionManager TQ_OBJECT public: - ActionManagerImpl(Part* part, TQObject* tqparent=0, const char* name=0); + ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0); virtual ~ActionManagerImpl(); virtual KAction* action(const char* name, const char* classname=0); diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 591e0d619..1cca9d903 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -39,8 +39,8 @@ namespace Akregator { -AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name) - : AddFeedWidgetBase(tqparent, name) +AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name) + : AddFeedWidgetBase(parent, name) { pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",KIcon::Desktop,KIcon::SizeHuge, KIcon::DefaultState, 0, true)); statusLabel->setText(TQString()); @@ -49,8 +49,8 @@ AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name) AddFeedWidget::~AddFeedWidget() {} -AddFeedDialog::AddFeedDialog(TQWidget *tqparent, const char *name) - : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel) +AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name) + : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel) { widget = new AddFeedWidget(this); connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&))); diff --git a/akregator/src/addfeeddialog.h b/akregator/src/addfeeddialog.h index 1152f3d09..113d7f2a2 100644 --- a/akregator/src/addfeeddialog.h +++ b/akregator/src/addfeeddialog.h @@ -43,7 +43,7 @@ namespace Akregator Q_OBJECT TQ_OBJECT public: - AddFeedWidget(TQWidget *tqparent = 0, const char *name = 0); + AddFeedWidget(TQWidget *parent = 0, const char *name = 0); ~AddFeedWidget(); }; @@ -52,7 +52,7 @@ namespace Akregator Q_OBJECT TQ_OBJECT public: - AddFeedDialog(TQWidget *tqparent = 0, const char *name = 0); + AddFeedDialog(TQWidget *parent = 0, const char *name = 0); ~AddFeedDialog(); void setURL(const TQString& t); diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index bd9f77cfe..223db5a01 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -117,9 +117,9 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor }; Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, - TQObject *tqparent, const char *name, const TQStringList& ) + TQObject *parent, const char *name, const TQStringList& ) : DCOPObject("AkregatorIface") - , MyBasePart(tqparent, name) + , MyBasePart(parent, name) , m_standardListLoaded(false) , m_shuttingDown(false) , m_mergedPart(0) diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index c60316cca..763aad84c 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -83,7 +83,7 @@ namespace Akregator /** Default constructor.*/ Part(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList&); + TQObject *parent, const char *name, const TQStringList&); /** Destructor. */ virtual ~Part(); diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index c92e4ec26..3aa9dd2c6 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -210,8 +210,8 @@ View::~View() kdDebug() << "View::~View(): leaving" << endl; } -View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char *name) - : TQWidget(tqparent, name), m_viewMode(NormalView), m_actionManager(actionManager) +View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name) + : TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager) { m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this); m_deleteNodeVisitor = new DeleteNodeVisitor(this); @@ -533,7 +533,7 @@ bool View::importFeeds(const TQDomDocument& doc) return true; } -bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent) +bool View::loadFeeds(const TQDomDocument& doc, Folder* parent) { FeedList* feedList = new FeedList(); bool parsed = feedList->readFromXML(doc); @@ -546,7 +546,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent) } m_feedListView->setUpdatesEnabled(false); m_tagNodeListView->setUpdatesEnabled(false); - if (!tqparent) + if (!parent) { TagSet* tagSet = Kernel::self()->tagSet(); @@ -578,7 +578,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent) } } else - m_feedList->append(feedList, tqparent); + m_feedList->append(feedList, parent); m_feedListView->setUpdatesEnabled(true); m_feedListView->triggerUpdate(); @@ -725,13 +725,13 @@ void View::slotMoveCurrentNodeUp() if (!current) return; TreeNode* prev = current->prevSibling(); - Folder* tqparent = current->tqparent(); + Folder* parent = current->parent(); - if (!prev || !tqparent) + if (!prev || !parent) return; - tqparent->removeChild(prev); - tqparent->insertChild(prev, current); + parent->removeChild(prev); + parent->insertChild(prev, current); m_listTabWidget->activeView()->ensureNodeVisible(current); } @@ -741,41 +741,41 @@ void View::slotMoveCurrentNodeDown() if (!current) return; TreeNode* next = current->nextSibling(); - Folder* tqparent = current->tqparent(); + Folder* parent = current->parent(); - if (!next || !tqparent) + if (!next || !parent) return; - tqparent->removeChild(current); - tqparent->insertChild(current, next); + parent->removeChild(current); + parent->insertChild(current, next); m_listTabWidget->activeView()->ensureNodeVisible(current); } void View::slotMoveCurrentNodeLeft() { TreeNode* current = m_listTabWidget->activeView()->selectedNode(); - if (!current || !current->tqparent() || !current->tqparent()->tqparent()) + if (!current || !current->parent() || !current->parent()->parent()) return; - Folder* tqparent = current->tqparent(); - Folder* grandtqparent = current->tqparent()->tqparent(); + Folder* parent = current->parent(); + Folder* grandparent = current->parent()->parent(); - tqparent->removeChild(current); - grandtqparent->insertChild(current, tqparent); + parent->removeChild(current); + grandparent->insertChild(current, parent); m_listTabWidget->activeView()->ensureNodeVisible(current); } void View::slotMoveCurrentNodeRight() { TreeNode* current = m_listTabWidget->activeView()->selectedNode(); - if (!current || !current->tqparent()) + if (!current || !current->parent()) return; TreeNode* prev = current->prevSibling(); if ( prev && prev->isGroup() ) { Folder* fg = static_cast<Folder*>(prev); - current->tqparent()->removeChild(current); + current->parent()->removeChild(current); fg->appendChild(current); m_listTabWidget->activeView()->ensureNodeVisible(current); } @@ -880,7 +880,7 @@ void View::slotFeedAdd() if ( m_feedListView->selectedNode()->isGroup()) group = static_cast<Folder*>(m_feedListView->selectedNode()); else - group= m_feedListView->selectedNode()->tqparent(); + group= m_feedListView->selectedNode()->parent(); } @@ -889,7 +889,7 @@ void View::slotFeedAdd() addFeed(TQString(), lastChild, group, false); } -void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool autoExec) +void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec) { AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" ); @@ -923,10 +923,10 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool return; } - if (!tqparent) - tqparent = m_feedList->rootNode(); + if (!parent) + parent = m_feedList->rootNode(); - tqparent->insertChild(feed, after); + parent->insertChild(feed, after); m_feedListView->ensureNodeVisible(feed); @@ -947,7 +947,7 @@ void View::slotFeedAddGroup() if (!node->isGroup()) { after = node; - node = node->tqparent(); + node = node->parent(); } Folder* currentGroup = static_cast<Folder*> (node); @@ -1272,12 +1272,12 @@ void View::slotCopyLinkAddress() } } -void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* tqparent) +void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* parent) { KURL::List::iterator it; for ( it = urls.begin(); it != urls.end(); ++it ) { - addFeed((*it).prettyURL(), after, tqparent, false); + addFeed((*it).prettyURL(), after, parent, false); } } diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index 66796d428..c6e94eb09 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -85,11 +85,11 @@ namespace Akregator { /** constructor @param part the Akregator::Part which contains this widget - @param tqparent tqparent widget + @param parent parent widget @param Actionmanager for this view @param name the name of the widget (@ref TQWidget ) */ - View(Akregator::Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char* name); + View(Akregator::Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char* name); /** destructor. Note that cleanups should be done in slotOnShutdown(), so we don't risk accessing self-deleting objects after deletion. */ @@ -104,11 +104,11 @@ namespace Akregator { @param doc the DOM tree (OPML) of the feeds to import */ bool importFeeds(const TQDomDocument& doc); - /** Parse OPML presentation of feeds and read in articles archive, if present. If @c tqparent is @c NULL, the current + /** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current feed list is replaced by the parsed one @param doc TQDomDocument generated from OPML - @param tqparent The tqparent group the new nodes */ - bool loadFeeds(const TQDomDocument& doc, Folder* tqparent = 0); + @param parent The parent group the new nodes */ + bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0); /** @return the displayed Feed List in OPML format @@ -190,7 +190,7 @@ namespace Akregator { void slotCaptionChanged(const TQString &); /** called when URLs are dropped into the tree view */ - void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *tqparent); + void slotFeedURLDropped (KURL::List &urls, TreeNode* after, Folder *parent); /** displays a URL in the status bar when the user moves the mouse over a link */ void slotMouseOverInfo(const KFileItem *kifi); @@ -272,7 +272,7 @@ namespace Akregator { protected: - void addFeed(const TQString& url, TreeNode* after, Folder* tqparent, bool autoExec = true); + void addFeed(const TQString& url, TreeNode* after, Folder* parent, bool autoExec = true); void connectToFeedList(FeedList* feedList); void disconnectFromFeedList(FeedList* feedList); diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index ecf262285..0ec644ad7 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -60,17 +60,17 @@ class ArticleListView::ArticleListViewPrivate { public: - ArticleListViewPrivate(ArticleListView* tqparent) : m_tqparent(tqparent) { } + ArticleListViewPrivate(ArticleListView* parent) : m_parent(parent) { } void ensureCurrentItemVisible() { - if (m_tqparent->currentItem()) + if (m_parent->currentItem()) { - m_tqparent->center( m_tqparent->contentsX(), m_tqparent->itemPos(m_tqparent->currentItem()), 0, 9.0 ); + m_parent->center( m_parent->contentsX(), m_parent->itemPos(m_parent->currentItem()), 0, 9.0 ); } } - ArticleListView* m_tqparent; + ArticleListView* m_parent; /** maps article to article item */ TQMap<Article, ArticleItem*> articleMap; @@ -131,7 +131,7 @@ class ArticleListView::ArticleItem : public KListViewItem friend class ArticleListView; public: - ArticleItem( TQListView *tqparent, const Article& a); + ArticleItem( TQListView *parent, const Article& a); ~ArticleItem(); Article& article(); @@ -155,8 +155,8 @@ class ArticleListView::ArticleItem : public KListViewItem }; // FIXME: Remove resolveEntities for KDE 4.0, it's now done in the parser -ArticleListView::ArticleItem::ArticleItem( TQListView *tqparent, const Article& a) - : KListViewItem( tqparent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t()) +ArticleListView::ArticleItem::ArticleItem( TQListView *parent, const Article& a) + : KListViewItem( parent, KCharsets::resolveEntities(a.title()), a.feed()->title(), KGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t()) { if (a.keep()) setPixmap(0, keepFlag()); @@ -213,8 +213,8 @@ int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascen /* ==================================================================================== */ -ArticleListView::ArticleListView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +ArticleListView::ArticleListView(TQWidget *parent, const char *name) + : KListView(parent, name) { d = new ArticleListViewPrivate(this); d->noneSelected = true; diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h index 5dbc08044..95fd64ad1 100644 --- a/akregator/src/articlelistview.h +++ b/akregator/src/articlelistview.h @@ -45,7 +45,7 @@ namespace Akregator Q_OBJECT TQ_OBJECT public: - ArticleListView(TQWidget *tqparent = 0, const char *name = 0); + ArticleListView(TQWidget *parent = 0, const char *name = 0); virtual ~ArticleListView(); /** returns the current article, or a null article if there is none */ diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 977abc99d..7aa745700 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -157,8 +157,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor ArticleViewer* m_view; }; -ArticleViewer::ArticleViewer(TQWidget *tqparent, const char *name) - : Viewer(tqparent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView) +ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) + : Viewer(parent, name), m_htmlFooter(), m_currentText(), m_node(0), m_viewMode(NormalView) { setJScriptEnabled(false); setJavaEnabled(false); diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h index 7d756262a..7b0e626e7 100644 --- a/akregator/src/articleviewer.h +++ b/akregator/src/articleviewer.h @@ -51,7 +51,7 @@ namespace Akregator TQ_OBJECT public: /** Constructor */ - ArticleViewer(TQWidget* tqparent, const char* name); + ArticleViewer(TQWidget* parent, const char* name); virtual ~ArticleViewer(); virtual bool openURL(const KURL &url); diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp index 76fd06c5d..4c3d43506 100644 --- a/akregator/src/configdialog.cpp +++ b/akregator/src/configdialog.cpp @@ -41,7 +41,7 @@ namespace Akregator { -ConfigDialog::ConfigDialog(TQWidget* tqparent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(tqparent, name, config, dialogType, dialogButtons, defaultButton, modal) +ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal) { addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings"); addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings"); diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h index 670742a99..f67140010 100644 --- a/akregator/src/configdialog.h +++ b/akregator/src/configdialog.h @@ -38,7 +38,7 @@ class ConfigDialog : public KConfigDialog TQ_OBJECT public: - ConfigDialog(TQWidget *tqparent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); + ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); virtual ~ConfigDialog(); diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index 2188b3843..44d40977e 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -365,7 +365,7 @@ bool Feed::fetchErrorOccurred() { return d->fetchError; } bool Feed::isArticlesLoaded() const { return d->articlesLoaded; } -TQDomElement Feed::toOPML( TQDomElement tqparent, TQDomDocument document ) const +TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const { TQDomElement el = document.createElement( "outline" ); el.setAttribute( "text", title() ); @@ -388,7 +388,7 @@ TQDomElement Feed::toOPML( TQDomElement tqparent, TQDomDocument document ) const el.setAttribute( "maxArticleNumber", d->maxArticleNumber ); el.setAttribute( "type", "rss" ); // despite some additional fields, its still "rss" OPML el.setAttribute( "version", "RSS" ); - tqparent.appendChild( el ); + parent.appendChild( el ); return el; } @@ -759,13 +759,13 @@ TreeNode* Feed::next() if ( nextSibling() ) return nextSibling(); - Folder* p = tqparent(); + Folder* p = parent(); while (p) { if ( p->nextSibling() ) return p->nextSibling(); else - p = p->tqparent(); + p = p->parent(); } return 0; } diff --git a/akregator/src/feed.h b/akregator/src/feed.h index c9590365b..663723cba 100644 --- a/akregator/src/feed.h +++ b/akregator/src/feed.h @@ -95,7 +95,7 @@ namespace Akregator virtual bool accept(TreeNodeVisitor* visitor); /** exports the feed settings to OPML */ - virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; /** returns whether this feed uses its own fetch interval or the global setting diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index ba75561ea..f1e8140b7 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -69,8 +69,8 @@ void FeedIconManager::fetchIcon(Feed* feed) loadIcon(iconURL); } -FeedIconManager::FeedIconManager(TQObject * tqparent, const char *name) -: TQObject(tqparent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate) +FeedIconManager::FeedIconManager(TQObject * parent, const char *name) +: TQObject(parent, name), DCOPObject("FeedIconManager"), d(new FeedIconManagerPrivate) { connectDCOPSignal("kded", "favicons", "iconChanged(bool, TQString, TQString)", diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp index 8cdafeada..03d0f077f 100644 --- a/akregator/src/feeditem.cpp +++ b/akregator/src/feeditem.cpp @@ -34,23 +34,23 @@ namespace Akregator { -FeedItem::FeedItem(FolderItem* tqparent, Feed* node) : TreeNodeItem(tqparent, node) +FeedItem::FeedItem(FolderItem* parent, Feed* node) : TreeNodeItem(parent, node) { initialize(node); } -FeedItem::FeedItem(KListView* tqparent, Feed* node) : TreeNodeItem(tqparent, node) +FeedItem::FeedItem(KListView* parent, Feed* node) : TreeNodeItem(parent, node) { initialize(node); } -FeedItem::FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node) +FeedItem::FeedItem(KListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node) { initialize(node); } -FeedItem::FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node) : TreeNodeItem(tqparent, after, node) +FeedItem::FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node) { initialize(node); } diff --git a/akregator/src/feeditem.h b/akregator/src/feeditem.h index 4f716a62b..ad0de2a3c 100644 --- a/akregator/src/feeditem.h +++ b/akregator/src/feeditem.h @@ -40,10 +40,10 @@ class FeedItem : public TreeNodeItem { public: - FeedItem(FolderItem* tqparent, Feed* node); - FeedItem(FolderItem* tqparent, TreeNodeItem* after, Feed* node); - FeedItem(KListView* tqparent, Feed* node); - FeedItem(KListView* tqparent, TreeNodeItem* after, Feed* node); + FeedItem(FolderItem* parent, Feed* node); + FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node); + FeedItem(KListView* parent, Feed* node); + FeedItem(KListView* parent, TreeNodeItem* after, Feed* node); virtual ~FeedItem(); virtual Feed* node(); diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp index 72db09113..1daf1aa63 100644 --- a/akregator/src/feedlist.cpp +++ b/akregator/src/feedlist.cpp @@ -80,8 +80,8 @@ class FeedList::RemoveNodeVisitor : public TreeNodeVisitor FeedList* m_list; }; -FeedList::FeedList(TQObject *tqparent, const char *name) - : NodeList(tqparent, name), d(new FeedListPrivate) +FeedList::FeedList(TQObject *parent, const char *name) + : NodeList(parent, name), d(new FeedListPrivate) { d->addNodeVisitor = new AddNodeVisitor(this); d->removeNodeVisitor = new RemoveNodeVisitor(this); @@ -104,7 +104,7 @@ void FeedList::removeNode(TreeNode* node) d->removeNodeVisitor->visit(node); } -void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent) +void FeedList::parseChildNodes(TQDomNode &node, Folder* parent) { TQDomElement e = node.toElement(); // try to convert the node to an element. @@ -119,13 +119,13 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent) { if (!d->urlMap[feed->xmlUrl()].contains(feed)) d->urlMap[feed->xmlUrl()].append(feed); - tqparent->appendChild(feed); + parent->appendChild(feed); } } else { Folder* fg = Folder::fromOPML(e); - tqparent->appendChild(fg); + parent->appendChild(fg); if (e.hasChildNodes()) { @@ -214,13 +214,13 @@ Article FeedList::findArticle(const TQString& feedURL, const TQString& guid) con return feed ? feed->findArticle(guid) : Article(); } -void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after) +void FeedList::append(FeedList* list, Folder* parent, TreeNode* after) { if ( list == this ) return; - if ( !flatList()->contains(tqparent) ) - tqparent = rootNode(); + if ( !flatList()->contains(parent) ) + parent = rootNode(); TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren(); @@ -228,7 +228,7 @@ void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after) for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it) { list->rootNode()->removeChild(*it); - tqparent->insertChild(*it, after); + parent->insertChild(*it, after); after = *it; } } diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h index 4e630ea7c..683cdd152 100644 --- a/akregator/src/feedlist.h +++ b/akregator/src/feedlist.h @@ -47,14 +47,14 @@ Q_OBJECT TQ_OBJECT public: - FeedList(TQObject *tqparent = 0, const char *name = 0); + FeedList(TQObject *parent = 0, const char *name = 0); /** Destructor. Contained nodes are deleted! */ ~FeedList(); /** appends another feed list as sub tree. The root node of @c list is ignored. NOTE: nodes are _moved_ from @c list to this feed list, not copied */ - void append(FeedList* list, Folder* tqparent=0, TreeNode* after=0); + void append(FeedList* list, Folder* parent=0, TreeNode* after=0); /** reads an OPML document and appends the items to this list @param doc the OPML document to parse @@ -82,7 +82,7 @@ protected: public: // compat with KDE-3.x assertions, remove for KDE 4 // private: - void parseChildNodes(TQDomNode &node, Folder* tqparent); + void parseChildNodes(TQDomNode &node, Folder* parent); // never call these FeedList(const FeedList&) : NodeList() {} diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index fa33b89da..aa6101ded 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -65,7 +65,7 @@ class NodeListView::NodeListViewPrivate bool showTagFolders; // Drag and Drop variables - TQListViewItem *tqparent; + TQListViewItem *parent; TQListViewItem *afterme; TQTimer autoopentimer; ConnectNodeVisitor* connectNodeVisitor; @@ -179,7 +179,7 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { - // delete child items recursively before deleting tqparent + // delete child items recursively before deleting parent TQValueList<TreeNode*> tqchildren = node->tqchildren(); for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) visit(*it); @@ -212,7 +212,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor TagNodeItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent())); if (parentItem) { if (prev) @@ -246,7 +246,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor TagFolderItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent())); if (parentItem) { if (prev) @@ -284,7 +284,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor FolderItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent())); if (parentItem) { if (prev) @@ -321,7 +321,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor FeedItem* item = 0; TreeNode* prev = node->prevSibling(); - FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent())); + FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent())); if (parentItem) { @@ -352,8 +352,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor NodeListView* m_view; }; -NodeListView::NodeListView( TQWidget *tqparent, const char *name) - : KListView(tqparent, name), d(new NodeListViewPrivate) +NodeListView::NodeListView( TQWidget *parent, const char *name) + : KListView(parent, name), d(new NodeListViewPrivate) { d->showTagFolders = true; d->connectNodeVisitor = new ConnectNodeVisitor(this), @@ -510,7 +510,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem* if (KURLDrag::canDecode(e)) { - FolderItem* tqparent = dynamic_cast<FolderItem*> (d->tqparent); + FolderItem* parent = dynamic_cast<FolderItem*> (d->parent); TreeNodeItem* afterMe = 0; if(d->afterme) @@ -519,7 +519,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem* KURL::List urls; KURLDrag::decode( e, urls ); e->accept(); - emit signalDropped( urls, afterMe ? afterMe->node() : 0, tqparent ? tqparent->node() : 0); + emit signalDropped( urls, afterMe ? afterMe->node() : 0, parent ? parent->node() : 0); } } else @@ -527,23 +527,23 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem* } } -void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem* /*afterme*/) +void NodeListView::movableDropEvent(TQListViewItem* /*parent*/, TQListViewItem* /*afterme*/) { d->autoopentimer.stop(); - if (d->tqparent) + if (d->parent) { openFolder(); - Folder* parentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node(); + Folder* parentNode = (dynamic_cast<FolderItem*> (d->parent))->node(); TreeNode* afterMeNode = 0; TreeNode* current = selectedNode(); if (d->afterme) afterMeNode = (dynamic_cast<TreeNodeItem*> (d->afterme))->node(); - current->tqparent()->removeChild(current); + current->parent()->removeChild(current); parentNode->insertChild(current, afterMeNode); - KListView::movableDropEvent(d->tqparent, d->afterme); + KListView::movableDropEvent(d->parent, d->afterme); } } @@ -557,13 +557,13 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) TQPoint vp = contentsToViewport(event->pos()); TQListViewItem *i = itemAt(vp); - TQListViewItem *qitqparent; + TQListViewItem *qiparent; TQListViewItem *qiafterme; - findDrop( event->pos(), qitqparent, qiafterme ); + findDrop( event->pos(), qiparent, qiafterme ); if (event->source() == viewport()) { // disable any drops where the result would be top level nodes - if (i && !i->tqparent()) + if (i && !i->parent()) { event->ignore(); d->autoopentimer.stop(); @@ -572,12 +572,12 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) // prevent dragging nodes from All Feeds to My Tags or vice versa TQListViewItem* root1 = i; - while (root1 && root1->tqparent()) - root1 = root1->tqparent(); + while (root1 && root1->parent()) + root1 = root1->parent(); TQListViewItem* root2 = selectedItem(); - while (root2 && root2->tqparent()) - root2 = root2->tqparent(); + while (root2 && root2->parent()) + root2 = root2->parent(); if (root1 != root2) { @@ -587,7 +587,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) } // don't drop node into own subtree - TQListViewItem* p = qitqparent; + TQListViewItem* p = qiparent; while (p) if (p == selectedItem()) { @@ -597,7 +597,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) } else { - p = p->tqparent(); + p = p->parent(); } // disable drags onto the item itself @@ -615,7 +615,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) // event->pos().x() < header()->cellPos(header()->mapToIndex(0))) // {} else - // do we want to move inside the old tqparent or do we want to move to a new tqparent + // do we want to move inside the old parent or do we want to move to a new parent if (i && (itemAt(vp - TQPoint(0,5)) == i && itemAt(vp + TQPoint(0,5)) == i)) { setDropVisualizer(false); @@ -625,10 +625,10 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) TreeNode *iNode = (dynamic_cast<TreeNodeItem*> (i))->node(); if (iNode->isGroup()) { - if (i != d->tqparent) + if (i != d->parent) d->autoopentimer.start(750); - d->tqparent = i; + d->parent = i; d->afterme = 0; } else @@ -644,7 +644,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) setDropVisualizer(true); setDropHighlighter(false); cleanItemHighlighter(); - d->tqparent = qitqparent; + d->parent = qiparent; d->afterme = qiafterme; d->autoopentimer.stop(); } @@ -665,7 +665,7 @@ bool NodeListView::acceptDrag(TQDropEvent *e) const else { // disable dragging of top-level nodes (All Feeds, My Tags) - if (selectedItem() && !selectedItem()->tqparent()) + if (selectedItem() && !selectedItem()->parent()) return false; else return true; @@ -719,8 +719,8 @@ void NodeListView::slotItemLeft() sel->setOpen(false); else { - if (sel->tqparent()) - setSelected( sel->tqparent(), true ); + if (sel->parent()) + setSelected( sel->parent(), true ); } ensureItemVisible( selectedItem() ); @@ -927,7 +927,7 @@ void NodeListView::slotNodeAdded(TreeNode* node) d->createItemVisitor->visit(node); } -void NodeListView::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node) +void NodeListView::slotNodeRemoved(Folder* /*parent*/, TreeNode* node) { if (node) d->deleteItemVisitor->deleteItem(node, false); @@ -1012,9 +1012,9 @@ TQDragObject *NodeListView::dragObject() void NodeListView::openFolder() { d->autoopentimer.stop(); - if (d->tqparent && !d->tqparent->isOpen()) + if (d->parent && !d->parent->isOpen()) { - d->tqparent->setOpen(true); + d->parent->setOpen(true); } } diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h index 1a5111f4d..52952089d 100644 --- a/akregator/src/feedlistview.h +++ b/akregator/src/feedlistview.h @@ -41,7 +41,7 @@ class NodeListView : public KListView Q_OBJECT TQ_OBJECT public: - NodeListView( TQWidget *tqparent = 0, const char *name = 0 ); + NodeListView( TQWidget *parent = 0, const char *name = 0 ); virtual ~NodeListView(); /** sets the feed list to show. Disconnects from the old feed list, if there is any. */ @@ -92,7 +92,7 @@ public slots: void slotItemBegin(); /** select last item in the list */ void slotItemEnd(); - /** go to tqparent item */ + /** go to parent item */ void slotItemLeft(); /** go to first child */ void slotItemRight(); @@ -133,7 +133,7 @@ public: // compat with KDE-3.x assertions, remove for KDE 4 int cx, int cy, int cw, int ch ); virtual void contentsDragMoveEvent(TQDragMoveEvent* event); virtual bool acceptDrag(TQDropEvent *event) const; - virtual void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme); + virtual void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme); virtual TQDragObject *dragObject(); @@ -155,10 +155,10 @@ protected slots: /** called when a node is added to the tree. If no item for the node exists, it will be created */ virtual void slotNodeAdded(TreeNode* node); - /** Called when a node in the tree is taken out of the tree (tqparent->removeChild()) + /** Called when a node in the tree is taken out of the tree (parent->removeChild()) Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */ - virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node); + virtual void slotNodeRemoved(Folder* parent, TreeNode* node); /** deletes the item belonging to the deleted node */ virtual void slotNodeDestroyed(TreeNode* node); @@ -195,7 +195,7 @@ class TagNodeListView : public NodeListView Q_OBJECT TQ_OBJECT public: - TagNodeListView(TQWidget *tqparent = 0, const char *name = 0) {} + TagNodeListView(TQWidget *parent = 0, const char *name = 0) {} virtual ~TagNodeListView() {} private: diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp index c00abe2e5..c78d9a487 100644 --- a/akregator/src/fetchqueue.cpp +++ b/akregator/src/fetchqueue.cpp @@ -42,7 +42,7 @@ class FetchQueue::FetchQueuePrivate }; -FetchQueue::FetchQueue(TQObject* tqparent, const char* name): TQObject(tqparent, name), d(new FetchQueuePrivate) {} +FetchQueue::FetchQueue(TQObject* parent, const char* name): TQObject(parent, name), d(new FetchQueuePrivate) {} FetchQueue::~FetchQueue() diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h index 9e92bb162..149ad6c1f 100644 --- a/akregator/src/fetchqueue.h +++ b/akregator/src/fetchqueue.h @@ -40,7 +40,7 @@ class FetchQueue : public TQObject public: - FetchQueue(TQObject* tqparent=0, const char* name=0); + FetchQueue(TQObject* parent=0, const char* name=0); virtual ~FetchQueue(); /** returns true when no feeds are neither fetching nor queued */ diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp index 2a0f2776e..1d2c6a5cf 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -115,11 +115,11 @@ TQValueList<Article> Folder::articles(const TQString& tag) return seq; } -TQDomElement Folder::toOPML( TQDomElement tqparent, TQDomDocument document ) const +TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const { TQDomElement el = document.createElement( "outline" ); el.setAttribute( "text", title() ); - tqparent.appendChild( el ); + parent.appendChild( el ); el.setAttribute("isOpen", d->open ? "true" : "false"); el.setAttribute( "id", TQString::number(id()) ); @@ -332,13 +332,13 @@ TreeNode* Folder::next() if ( nextSibling() ) return nextSibling(); - Folder* p = tqparent(); + Folder* p = parent(); while (p) { if ( p->nextSibling() ) return p->nextSibling(); else - p = p->tqparent(); + p = p->parent(); } return 0; } diff --git a/akregator/src/folder.h b/akregator/src/folder.h index 32811f679..6743dd573 100644 --- a/akregator/src/folder.h +++ b/akregator/src/folder.h @@ -79,12 +79,12 @@ namespace Akregator /** Helps the rest of the app to decide if node should be handled as group or not. Use only where necessary, use polymorphism where possible. */ virtual bool isGroup() const { return true; } - /** converts the feed group into OPML format for save and export and appends it to node @c tqparent in document @document. + /** converts the feed group into OPML format for save and export and appends it to node @c parent in document @document. Children are processed and appended recursively. - @param tqparent The tqparent element + @param parent The parent element @param document The DOM document @return The newly created element representing this feed group */ - virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; /** returns the (direct) tqchildren of this node. @return a list of pointers to the child nodes diff --git a/akregator/src/folderitem.cpp b/akregator/src/folderitem.cpp index baab25f3f..c9866c19c 100644 --- a/akregator/src/folderitem.cpp +++ b/akregator/src/folderitem.cpp @@ -33,22 +33,22 @@ namespace Akregator { -FolderItem::FolderItem(FolderItem* tqparent, Folder* node) : TreeNodeItem(tqparent, node) +FolderItem::FolderItem(FolderItem* parent, Folder* node) : TreeNodeItem(parent, node) { initialize(node); } -FolderItem::FolderItem(FolderItem* tqparent, TreeNodeItem* after, Folder* node) : TreeNodeItem(tqparent, after, node) +FolderItem::FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node) { initialize(node); } -FolderItem::FolderItem(KListView* tqparent, Folder* node) : TreeNodeItem(tqparent, node) +FolderItem::FolderItem(KListView* parent, Folder* node) : TreeNodeItem(parent, node) { initialize(node); } -FolderItem::FolderItem(KListView* tqparent, TreeNodeItem* after, Folder* node) : TreeNodeItem(tqparent, after, node) +FolderItem::FolderItem(KListView* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node) { initialize(node); } diff --git a/akregator/src/folderitem.h b/akregator/src/folderitem.h index 02516e032..efc4d4e9f 100644 --- a/akregator/src/folderitem.h +++ b/akregator/src/folderitem.h @@ -41,10 +41,10 @@ class FolderItem : public TreeNodeItem { public: - FolderItem(FolderItem* tqparent, Folder* node); - FolderItem(FolderItem* tqparent, TreeNodeItem* after, Folder* node); - FolderItem(KListView* tqparent, Folder* node); - FolderItem(KListView* tqparent, TreeNodeItem* after, Folder* node); + FolderItem(FolderItem* parent, Folder* node); + FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node); + FolderItem(KListView* parent, Folder* node); + FolderItem(KListView* parent, TreeNodeItem* after, Folder* node); virtual ~FolderItem(); virtual Folder* node(); diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index e800bafda..f0f48cea1 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -37,8 +37,8 @@ namespace Akregator { -Frame::Frame(TQObject * tqparent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals) - :TQObject(tqparent, "aKregatorFrame") +Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, const TQString& tit, bool watchSignals) + :TQObject(parent, "aKregatorFrame") { m_autoDeletePart = false; m_part=p; diff --git a/akregator/src/frame.h b/akregator/src/frame.h index b504cc44d..24a879546 100644 --- a/akregator/src/frame.h +++ b/akregator/src/frame.h @@ -46,7 +46,7 @@ namespace Akregator TQ_OBJECT public: - Frame(TQObject *tqparent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true); + Frame(TQObject *parent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true); virtual ~Frame(); enum {Idle, Started, Completed, Canceled}; diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 14e0bb125..59949244b 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -261,9 +261,9 @@ TQString Article::meta(const TQString &key) const return d->meta[key]; } -KURLLabel *Article::widget(TQWidget *tqparent, const char *name) const +KURLLabel *Article::widget(TQWidget *parent, const char *name) const { - KURLLabel *label = new KURLLabel(d->link.url(), d->title, tqparent, name); + KURLLabel *label = new KURLLabel(d->link.url(), d->title, parent, name); label->setUseTips(true); if (!d->description.isNull()) label->setTipText(d->description); diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index 833b224a4..7656eeeda 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -145,7 +145,7 @@ namespace RSS TQString meta(const TQString &key) const; /** - * @param tqparent The tqparent widget for the KURLLabel. + * @param parent The parent widget for the KURLLabel. * @param name A name for the widget which will be used internally. * @return a widget (a KURLLabel in this case) for the Article. * This makes building a user-interface which contains the @@ -158,7 +158,7 @@ namespace RSS * Note that you have to delete the KURLLabel object returned by * this method yourself. */ - KURLLabel *widget(TQWidget *tqparent = 0, const char *name = 0) const; + KURLLabel *widget(TQWidget *parent = 0, const char *name = 0) const; typedef TQMap<TQString, TQString> MetaInfoMap; diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index bc10f8a31..610cec4c8 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -183,7 +183,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->link = extractLink(channelNode, d->format); - /* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent + /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0. */ TQDomNode parentNode; diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index baaa6409d..c4daa0561 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -30,9 +30,9 @@ time_t parseISO8601Date(const TQString &s) return KRFCDate::parseDateISO8601(s + "T12:00:00"); } -TQString childNodesAsXML(const TQDomNode& tqparent) +TQString childNodesAsXML(const TQDomNode& parent) { - TQDomNodeList list = tqparent.childNodes(); + TQDomNodeList list = parent.childNodes(); TQString str; TQTextStream ts( &str, IO_WriteOnly ); for (uint i = 0; i < list.count(); ++i) @@ -117,9 +117,9 @@ static TQString extractAtomContent(const TQDomElement& e) return TQString(); } -TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined) +TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined) { - TQDomNode node = tqparent.namedItem(elemName); + TQDomNode node = parent.namedItem(elemName); if (node.isNull()) return TQString(); @@ -143,9 +143,9 @@ TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool i return result.isEmpty() ? TQString() : result; } -TQString extractTitle(const TQDomNode & tqparent) +TQString extractTitle(const TQDomNode & parent) { - TQDomNode node = tqparent.namedItem(TQString::tqfromLatin1("title")); + TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title")); if (node.isNull()) return TQString(); diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h index 900baa225..47be905d8 100644 --- a/akregator/src/librss/tools_p.h +++ b/akregator/src/librss/tools_p.h @@ -29,9 +29,9 @@ namespace RSS unsigned int count; }; - TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined=true); - TQString extractTitle(const TQDomNode &tqparent); - TQString childNodesAsXML(const TQDomNode& tqparent); + TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true); + TQString extractTitle(const TQDomNode &parent); + TQString childNodesAsXML(const TQDomNode& parent); time_t parseISO8601Date(const TQString &s); TQString parseItemAuthor(const TQDomElement& element, Format format, Version version); } diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index a8c8f5d14..a137f1fe7 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -152,7 +152,7 @@ void ListTabWidget::slotTabClicked(int id) } } -ListTabWidget::ListTabWidget(TQWidget* tqparent, const char* name) : TQWidget(tqparent, name), d(new ListTabWidgetPrivate) +ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(parent, name), d(new ListTabWidgetPrivate) { d->idCounter = 0; d->current = 0; diff --git a/akregator/src/listtabwidget.h b/akregator/src/listtabwidget.h index f720d36f1..1dd4d92e7 100644 --- a/akregator/src/listtabwidget.h +++ b/akregator/src/listtabwidget.h @@ -50,7 +50,7 @@ Q_OBJECT public: - ListTabWidget(TQWidget* tqparent=0, const char* name=0); + ListTabWidget(TQWidget* parent=0, const char* name=0); virtual ~ListTabWidget(); enum ViewMode { single, /* horizontalTabs, */ verticalTabs }; @@ -72,7 +72,7 @@ public slots: void slotItemBegin(); /** select last item in the list */ void slotItemEnd(); - /** go to tqparent item */ + /** go to parent item */ void slotItemLeft(); /** go to first child */ void slotItemRight(); diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 1e1761cad..4f167afbc 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -298,7 +298,7 @@ 2003-01-24 Fixed cleanup order bug in Mk4tcl There was a long-standing bug in Mk4tcl, in which cleanup order of - MkPath objects caused them to access their MkWorkspace tqparent even + MkPath objects caused them to access their MkWorkspace parent even though it was already deleted. This may have caused some of the crash-on-exit bugs in the past. diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp index dda916abd..2d191c645 100644 --- a/akregator/src/mk4storage/metakit/src/column.cpp +++ b/akregator/src/mk4storage/metakit/src/column.cpp @@ -770,7 +770,7 @@ void c4_Column::StoreBytes(t4_i32 pos_, const c4_Bytes& buffer_) t4_i32 c4_Column::PullValue(const t4_byte*& ptr_) { - t4_i32 tqmask = *ptr_ ? 0 : ~0; + t4_i32 mask = *ptr_ ? 0 : ~0; t4_i32 v = 0; for (;;) { @@ -779,7 +779,7 @@ t4_i32 c4_Column::PullValue(const t4_byte*& ptr_) break; } - return tqmask ^ (v - 0x80); // oops, last byte had bit 7 set + return mask ^ (v - 0x80); // oops, last byte had bit 7 set } void c4_Column::PushValue(t4_byte*& ptr_, t4_i32 v_) @@ -1398,7 +1398,7 @@ void c4_ColOfInts::ResizeData(int index_, int count_, bool clear_) /* _currwidth 1: 2: 4: * shiftPos 3 2 1 shift the offset right this much - * maskPos 7 3 1 tqmask the offset with this + * maskPos 7 3 1 mask the offset with this */ const int shiftPos = _currWidth == 4 ? 1 : 4 - _currWidth; diff --git a/akregator/src/mk4storage/metakit/src/custom.cpp b/akregator/src/mk4storage/metakit/src/custom.cpp index 6ed1d5ab3..a6275cea7 100644 --- a/akregator/src/mk4storage/metakit/src/custom.cpp +++ b/akregator/src/mk4storage/metakit/src/custom.cpp @@ -233,7 +233,7 @@ bool c4_CustomViewer::RemoveRows(int, int) class c4_SliceViewer : public c4_CustomViewer { - c4_View _tqparent; + c4_View _parent; int _first, _limit, _step; public: @@ -249,7 +249,7 @@ public: }; c4_SliceViewer::c4_SliceViewer (c4_Sequence& seq_, int first_, int limit_, int step_) - : _tqparent (&seq_), _first (first_), _limit (limit_), _step (step_) + : _parent (&seq_), _first (first_), _limit (limit_), _step (step_) { d4_assert(_step != 0); } @@ -260,12 +260,12 @@ c4_SliceViewer::~c4_SliceViewer () c4_View c4_SliceViewer::GetTemplate() { - return _tqparent.Clone(); // could probably return _tqparent just as well + return _parent.Clone(); // could probably return _parent just as well } int c4_SliceViewer::GetSize() { - int n = _limit >= 0 ? _limit : _tqparent.GetSize(); + int n = _limit >= 0 ? _limit : _parent.GetSize(); if (n < _first) n = _first; @@ -277,14 +277,14 @@ bool c4_SliceViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1); - return _tqparent.GetItem(row_, col_, buf_); + return _parent.GetItem(row_, col_, buf_); } bool c4_SliceViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1); - _tqparent.SetItem(row_, col_, buf_); + _parent.SetItem(row_, col_, buf_); return true; } @@ -297,7 +297,7 @@ bool c4_SliceViewer::InsertRows(int pos_, c4_Cursor value_, int count_) if (_limit >= 0) _limit += count_; - _tqparent.InsertAt(pos_, *value_, count_); + _parent.InsertAt(pos_, *value_, count_); return true; } @@ -310,7 +310,7 @@ bool c4_SliceViewer::RemoveRows(int pos_, int count_) if (_limit >= 0) _limit -= count_; - _tqparent.RemoveAt(pos_, count_); + _parent.RemoveAt(pos_, count_); return true; } @@ -323,7 +323,7 @@ c4_CustomViewer* f4_CustSlice(c4_Sequence& seq_, int first_, int limit_, int ste class c4_ProductViewer : public c4_CustomViewer { - c4_View _tqparent, _argView, _template; + c4_View _parent, _argView, _template; public: c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_); @@ -335,7 +335,7 @@ public: }; c4_ProductViewer::c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_) - : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone()) + : _parent (&seq_), _argView (view_), _template (_parent.Clone()) { for (int i = 0; i < _argView.NumProperties(); ++i) _template.AddProperty(_argView.NthProperty(i)); @@ -352,12 +352,12 @@ c4_View c4_ProductViewer::GetTemplate() int c4_ProductViewer::GetSize() { - return _tqparent.GetSize() * _argView.GetSize(); + return _parent.GetSize() * _argView.GetSize(); } bool c4_ProductViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _tqparent; + c4_View v = _parent; if (col_ < v.NumProperties()) { @@ -384,7 +384,7 @@ c4_CustomViewer* f4_CustProduct(c4_Sequence& seq_, const c4_View& view_) class c4_RemapWithViewer : public c4_CustomViewer { - c4_View _tqparent, _argView; + c4_View _parent, _argView; public: c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_); @@ -397,7 +397,7 @@ public: }; c4_RemapWithViewer::c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_) - : _tqparent (&seq_), _argView (view_) + : _parent (&seq_), _argView (view_) { } @@ -407,7 +407,7 @@ c4_RemapWithViewer::~c4_RemapWithViewer () c4_View c4_RemapWithViewer::GetTemplate() { - return _tqparent.Clone(); // could probably return _tqparent just as well + return _parent.Clone(); // could probably return _parent just as well } int c4_RemapWithViewer::GetSize() @@ -422,7 +422,7 @@ bool c4_RemapWithViewer::GetItem(int row_, int col_, c4_Bytes& buf_) row_ = ((const c4_IntProp&) map) (_argView[row_]); - return _tqparent.GetItem(row_, col_, buf_); + return _parent.GetItem(row_, col_, buf_); } bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) @@ -432,7 +432,7 @@ bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) row_ = ((const c4_IntProp&) map) (_argView[row_]); - _tqparent.SetItem(row_, col_, buf_); + _parent.SetItem(row_, col_, buf_); return true; } @@ -445,7 +445,7 @@ c4_CustomViewer* f4_CustRemapWith(c4_Sequence& seq_, const c4_View& view_) class c4_PairViewer : public c4_CustomViewer { - c4_View _tqparent, _argView, _template; + c4_View _parent, _argView, _template; public: c4_PairViewer (c4_Sequence& seq_, const c4_View& view_); @@ -460,7 +460,7 @@ public: }; c4_PairViewer::c4_PairViewer (c4_Sequence& seq_, const c4_View& view_) - : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone()) + : _parent (&seq_), _argView (view_), _template (_parent.Clone()) { for (int i = 0; i < _argView.NumProperties(); ++i) _template.AddProperty(_argView.NthProperty(i)); @@ -477,12 +477,12 @@ c4_View c4_PairViewer::GetTemplate() int c4_PairViewer::GetSize() { - return _tqparent.GetSize(); + return _parent.GetSize(); } bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _tqparent; + c4_View v = _parent; if (col_ >= v.NumProperties()) { @@ -496,7 +496,7 @@ bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_) bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { - c4_View v = _tqparent; + c4_View v = _parent; if (col_ >= v.NumProperties()) { @@ -511,14 +511,14 @@ bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) bool c4_PairViewer::InsertRows(int pos_, c4_Cursor value_, int count_) { - _tqparent.InsertAt(pos_, *value_, count_); + _parent.InsertAt(pos_, *value_, count_); _argView.InsertAt(pos_, *value_, count_); return true; } bool c4_PairViewer::RemoveRows(int pos_, int count_) { - _tqparent.RemoveAt(pos_, count_); + _parent.RemoveAt(pos_, count_); _argView.RemoveAt(pos_, count_); return true; } @@ -532,7 +532,7 @@ c4_CustomViewer* f4_CustPair(c4_Sequence& seq_, const c4_View& view_) class c4_ConcatViewer : public c4_CustomViewer { - c4_View _tqparent, _argView; + c4_View _parent, _argView; public: c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_); @@ -545,7 +545,7 @@ public: }; c4_ConcatViewer::c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_) - : _tqparent (&seq_), _argView (view_) + : _parent (&seq_), _argView (view_) { } @@ -555,23 +555,23 @@ c4_ConcatViewer::~c4_ConcatViewer () c4_View c4_ConcatViewer::GetTemplate() { - return _tqparent.Clone(); // could probably return _tqparent just as well + return _parent.Clone(); // could probably return _parent just as well } int c4_ConcatViewer::GetSize() { - return _tqparent.GetSize() + _argView.GetSize(); + return _parent.GetSize() + _argView.GetSize(); } bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _tqparent; + c4_View v = _parent; - if (row_ >= _tqparent.GetSize()) + if (row_ >= _parent.GetSize()) { v = _argView; - row_ -= _tqparent.GetSize(); - col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId()); + row_ -= _parent.GetSize(); + col_ = v.FindProperty(_parent.NthProperty(col_).GetId()); if (col_ < 0) return false; @@ -582,13 +582,13 @@ bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_) bool c4_ConcatViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { - c4_View v = _tqparent; + c4_View v = _parent; - if (row_ >= _tqparent.GetSize()) + if (row_ >= _parent.GetSize()) { v = _argView; - row_ -= _tqparent.GetSize(); - col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId()); + row_ -= _parent.GetSize(); + col_ = v.FindProperty(_parent.NthProperty(col_).GetId()); d4_assert(col_ >= 0); } @@ -605,7 +605,7 @@ c4_CustomViewer* f4_CustConcat(c4_Sequence& seq_, const c4_View& view_) class c4_RenameViewer : public c4_CustomViewer { - c4_View _tqparent, _template; + c4_View _parent, _template; public: c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_, @@ -622,11 +622,11 @@ public: c4_RenameViewer::c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_, const c4_Property& new_) - : _tqparent (&seq_) + : _parent (&seq_) { - for (int i = 0; i < _tqparent.NumProperties(); ++i) + for (int i = 0; i < _parent.NumProperties(); ++i) { - const c4_Property& prop = _tqparent.NthProperty(i); + const c4_Property& prop = _parent.NthProperty(i); _template.AddProperty(prop.GetId() == old_.GetId() ? new_ : prop); } } @@ -642,17 +642,17 @@ c4_View c4_RenameViewer::GetTemplate() int c4_RenameViewer::GetSize() { - return _tqparent.GetSize(); + return _parent.GetSize(); } bool c4_RenameViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - return _tqparent.GetItem(row_, col_, buf_); + return _parent.GetItem(row_, col_, buf_); } bool c4_RenameViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { - _tqparent.SetItem(row_, col_, buf_); + _parent.SetItem(row_, col_, buf_); return true; } @@ -666,7 +666,7 @@ c4_CustomViewer* f4_CustRename(c4_Sequence& seq_, const c4_Property& old_, class c4_GroupByViewer : public c4_CustomViewer { - c4_View _tqparent, _keys, _sorted, _temp; + c4_View _parent, _keys, _sorted, _temp; c4_Property _result; c4_DWordArray _map; @@ -685,9 +685,9 @@ public: c4_GroupByViewer::c4_GroupByViewer (c4_Sequence& seq_, const c4_View& keys_, const c4_Property& result_) - : _tqparent (&seq_), _keys (keys_), _result (result_) + : _parent (&seq_), _keys (keys_), _result (result_) { - _sorted = _tqparent.SortOn(_keys); + _sorted = _parent.SortOn(_keys); int n = _sorted.GetSize(); c4_Bytes temp; @@ -804,7 +804,7 @@ c4_CustomViewer* f4_CustGroupBy(c4_Sequence& seq_, const c4_View& template_, class c4_JoinPropViewer : public c4_CustomViewer { - c4_View _tqparent, _template; + c4_View _parent, _template; c4_ViewProp _sub; int _subPos, _subWidth; c4_DWordArray _base, _offset; @@ -820,20 +820,20 @@ public: c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_, const c4_ViewProp& sub_, bool outer_) - : _tqparent (&seq_), - _sub (sub_), _subPos (_tqparent.FindProperty(sub_.GetId())), _subWidth (0) + : _parent (&seq_), + _sub (sub_), _subPos (_parent.FindProperty(sub_.GetId())), _subWidth (0) { d4_assert(_subPos >= 0); - for (int k = 0; k < _tqparent.NumProperties(); ++k) + for (int k = 0; k < _parent.NumProperties(); ++k) { if (k != _subPos) - _template.AddProperty(_tqparent.NthProperty(k)); + _template.AddProperty(_parent.NthProperty(k)); else // if there are no rows, then this join does very little anyway //! OOPS: if this is an unattached view, then the subviews can differ - if (_tqparent.GetSize() > 0) + if (_parent.GetSize() > 0) { - c4_View view = sub_ (_tqparent[0]); + c4_View view = sub_ (_parent[0]); for (int l = 0; l < view.NumProperties(); ++l) { _template.AddProperty(view.NthProperty(l)); @@ -845,9 +845,9 @@ c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_, _base.SetSize(0, 5); _offset.SetSize(0, 5); - for (int i = 0; i < _tqparent.GetSize(); ++i) + for (int i = 0; i < _parent.GetSize(); ++i) { - c4_View v = _sub (_tqparent[i]); + c4_View v = _sub (_parent[i]); int n = v.GetSize(); if (n == 0 && outer_) @@ -880,7 +880,7 @@ int c4_JoinPropViewer::GetSize() bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _tqparent; + c4_View v = _parent; int r = _base.GetAt(row_); if (col_ >= _subPos) @@ -890,7 +890,7 @@ bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_) } else { - v = _sub (_tqparent[r]); + v = _sub (_parent[r]); r = _offset.GetAt(row_); if (r < 0) return false; // if this is a null row in an outer join @@ -913,7 +913,7 @@ c4_CustomViewer* f4_CustJoinProp(c4_Sequence& seq_, class c4_JoinViewer : public c4_CustomViewer { - c4_View _tqparent, _argView, _template; + c4_View _parent, _argView, _template; c4_DWordArray _base, _offset; public: @@ -928,14 +928,14 @@ public: c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_, const c4_View& view_, bool outer_) - : _tqparent (&seq_), _argView (view_.SortOn(keys_)) + : _parent (&seq_), _argView (view_.SortOn(keys_)) { // why not in GetTemplate, since we don't need to know this... - _template = _tqparent.Clone(); + _template = _parent.Clone(); for (int l = 0; l < _argView.NumProperties(); ++l) _template.AddProperty(_argView.NthProperty(l)); - c4_View sorted = _tqparent.SortOn(keys_).Project(keys_); + c4_View sorted = _parent.SortOn(keys_).Project(keys_); c4_View temp = _argView.Project(keys_); _base.SetSize(0, 5); @@ -945,7 +945,7 @@ c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_, for (int i = 0; i < sorted.GetSize(); ++i) { - int orig = _tqparent.GetIndexOf(sorted[i]); + int orig = _parent.GetIndexOf(sorted[i]); d4_assert(orig >= 0); if (i > 0 && sorted[i] == sorted[i-1]) @@ -1009,7 +1009,7 @@ int c4_JoinViewer::GetSize() bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _tqparent; + c4_View v = _parent; int r = _base.GetAt(row_); if (col_ >= v.NumProperties()) @@ -1030,7 +1030,7 @@ bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_) #if 0 bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _tqparent; + c4_View v = _parent; int o = 0; int r = _offset.GetAt(row_); diff --git a/akregator/src/mk4storage/metakit/src/handler.cpp b/akregator/src/mk4storage/metakit/src/handler.cpp index 9bacfc9f8..6c68c5c3f 100644 --- a/akregator/src/mk4storage/metakit/src/handler.cpp +++ b/akregator/src/mk4storage/metakit/src/handler.cpp @@ -78,13 +78,13 @@ void c4_Handler::Move(int from_, int to_) // c4_HandlerSeq c4_HandlerSeq::c4_HandlerSeq (c4_Persist* persist_) - : _persist (persist_), _field (0), _tqparent (0), _numRows (0) + : _persist (persist_), _field (0), _parent (0), _numRows (0) { } c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_) : _persist (owner_.Persist()), _field (owner_.FindField(handler_)), - _tqparent (&owner_), _numRows (0) + _parent (&owner_), _numRows (0) { for (int i = 0; i < NumFields(); ++i) { c4_Field& field = Field(i); @@ -98,7 +98,7 @@ c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_) c4_HandlerSeq::~c4_HandlerSeq () { - const bool rootLevel = _tqparent == this; + const bool rootLevel = _parent == this; c4_Persist* pers = _persist; if (rootLevel && pers != 0) @@ -129,7 +129,7 @@ c4_Persist* c4_HandlerSeq::Persist() const void c4_HandlerSeq::DefineRoot() { d4_assert(_field == 0); - d4_assert(_tqparent == 0); + d4_assert(_parent == 0); SetNumRows(1); @@ -137,7 +137,7 @@ void c4_HandlerSeq::DefineRoot() _field = d4_new c4_Field (desc); d4_assert(!*desc); - _tqparent = this; + _parent = this; } c4_Handler* c4_HandlerSeq::CreateHandler(const c4_Property& prop_) @@ -162,7 +162,7 @@ void c4_HandlerSeq::DetachFromParent() _field = 0; } - _tqparent = 0; + _parent = 0; } void c4_HandlerSeq::DetachFromStorage(bool full_) @@ -293,7 +293,7 @@ void c4_HandlerSeq::Restructure(c4_Field& field_, bool remove_) } } - if (_tqparent == this) + if (_parent == this) delete ofld; // the root table owns its field structure tree } @@ -398,8 +398,8 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_); // adjust the parents - t1._tqparent = this; - t2._tqparent = &dst_; + t1._parent = this; + t2._parent = &dst_; // reattach the proper field structures t1.Restructure(Field(col), false); diff --git a/akregator/src/mk4storage/metakit/src/handler.h b/akregator/src/mk4storage/metakit/src/handler.h index 7cf2efdf6..6003f625d 100644 --- a/akregator/src/mk4storage/metakit/src/handler.h +++ b/akregator/src/mk4storage/metakit/src/handler.h @@ -88,7 +88,7 @@ class c4_HandlerSeq : public c4_Sequence c4_PtrArray _handlers; c4_Persist* _persist; c4_Field* _field; - c4_HandlerSeq* _tqparent; + c4_HandlerSeq* _parent; int _numRows; public: diff --git a/akregator/src/mk4storage/metakit/src/handler.inl b/akregator/src/mk4storage/metakit/src/handler.inl index 10d45f3ce..75321f9c7 100644 --- a/akregator/src/mk4storage/metakit/src/handler.inl +++ b/akregator/src/mk4storage/metakit/src/handler.inl @@ -84,7 +84,7 @@ d4_inline const c4_Sequence* c4_HandlerSeq::HandlerContext(int) const d4_inline c4_HandlerSeq& c4_HandlerSeq::Parent() const { - return *_tqparent; + return *_parent; } ///////////////////////////////////////////////////////////////////////////// diff --git a/akregator/src/mk4storage/metakit/src/remap.cpp b/akregator/src/mk4storage/metakit/src/remap.cpp index 9bc9b440f..cc8175df2 100644 --- a/akregator/src/mk4storage/metakit/src/remap.cpp +++ b/akregator/src/mk4storage/metakit/src/remap.cpp @@ -258,10 +258,10 @@ t4_i32 c4_HashViewer::CalcHash(c4_Cursor cursor_) const int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const { - const unsigned int tqmask = _map.GetSize() - 2; + const unsigned int mask = _map.GetSize() - 2; /* We must come up with (i, incr) such that 0 <= i < _size and 0 < incr < _size and both are a function of hash */ - int i = tqmask & ~hash_; + int i = mask & ~hash_; /* We use ~hash_ instead of hash_, as degenerate hash functions, such as for ints <sigh>, can have lots of leading zeros. It's not really a performance risk, but better safe than sorry. */ @@ -272,14 +272,14 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const /* Derive incr from hash_, just to make it more arbitrary. Note that incr must not be 0, or we will get into an infinite loop.*/ - unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & tqmask; + unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & mask; if (!incr) - incr = tqmask; + incr = mask; int poly = GetPoly(); for (;;) { - i = (i+incr) & tqmask; + i = (i+incr) & mask; if (IsUnused(i)) break; if (Hash(i) == hash_ && KeySame(Row(i), cursor_)) @@ -288,7 +288,7 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const freeslot = i; /* Cycle through GF(2^n)-{0} */ incr = incr << 1; - if (incr > tqmask) + if (incr > mask) incr ^= poly; /* This will implicitely clear the highest bit */ } diff --git a/akregator/src/mk4storage/metakit/tests/ok/f07a.txt b/akregator/src/mk4storage/metakit/tests/ok/f07a.txt index 8f3ed2077..79963d7b4 100644 --- a/akregator/src/mk4storage/metakit/tests/ok/f07a.txt +++ b/akregator/src/mk4storage/metakit/tests/ok/f07a.txt @@ -1,3 +1,3 @@ VIEW 1 rows = dict:V 0: subview 'dict' - VIEW 0 rows = tqparent:I index:I view:V + VIEW 0 rows = parent:I index:I view:V diff --git a/akregator/src/mk4storage/metakit/tests/tformat.cpp b/akregator/src/mk4storage/metakit/tests/tformat.cpp index 67530b7fd..ba6e92549 100644 --- a/akregator/src/mk4storage/metakit/tests/tformat.cpp +++ b/akregator/src/mk4storage/metakit/tests/tformat.cpp @@ -207,7 +207,7 @@ void TestFormat() c4_View v3 = pView (v2[0]); A(v3.GetSize() == 2); */ - #define FORMAT07 "dict[tqparent:I,index:I,view[name:S,type:S,child:I]]" + #define FORMAT07 "dict[parent:I,index:I,view[name:S,type:S,child:I]]" c4_Storage s1 ("f07a", 1); s1.SetStructure(FORMAT07); diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp index 1ed274d1c..6bcee5f6d 100644 --- a/akregator/src/nodelist.cpp +++ b/akregator/src/nodelist.cpp @@ -118,7 +118,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor NodeList* m_list; }; -NodeList::NodeList(TQObject *tqparent, const char *name) : d(new NodeListPrivate) +NodeList::NodeList(TQObject *parent, const char *name) : d(new NodeListPrivate) { d->rootNode = 0; d->addNodeVisitor = new AddNodeVisitor(this); @@ -215,8 +215,8 @@ int NodeList::generateID() void NodeList::slotNodeAdded(TreeNode* node) { - Folder* tqparent = node->tqparent(); - if ( !node || !d->flatList.contains(tqparent) || d->flatList.contains(node) ) + Folder* parent = node->parent(); + if ( !node || !d->flatList.contains(parent) || d->flatList.contains(node) ) return; addNode(node, false); @@ -230,7 +230,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node) removeNode(node); } -void NodeList::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node) +void NodeList::slotNodeRemoved(Folder* /*parent*/, TreeNode* node) { if ( !node || !d->flatList.contains(node) ) return; diff --git a/akregator/src/nodelist.h b/akregator/src/nodelist.h index 3d628ec78..c441ead7e 100644 --- a/akregator/src/nodelist.h +++ b/akregator/src/nodelist.h @@ -52,7 +52,7 @@ Q_OBJECT TQ_OBJECT public: - NodeList(TQObject *tqparent=0, const char *name=0); + NodeList(TQObject *parent=0, const char *name=0); virtual ~NodeList(); virtual Folder* rootNode() const; @@ -104,7 +104,7 @@ public slots: // compat with KDE-3.x assertions, remove for KDE 4 virtual void slotNodeDestroyed(TreeNode* node); virtual void slotNodeAdded(TreeNode* node); - virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node); + virtual void slotNodeRemoved(Folder* parent, TreeNode* node); public: // compat with KDE-3.x assertions, remove for KDE 4 // private: diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 0392535cf..70e0e413f 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -95,8 +95,8 @@ class PageViewer::PageViewerPrivate }; -PageViewer::PageViewer(TQWidget *tqparent, const char *name) - : Viewer(tqparent, name), d(new PageViewerPrivate) +PageViewer::PageViewer(TQWidget *parent, const char *name) + : Viewer(parent, name), d(new PageViewerPrivate) { // this hack is necessary since the part looks for []HTML Settings] in // KGlobal::config() by default, which is wrong when running in Kontact diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h index 2fb3a155c..82b497d65 100644 --- a/akregator/src/pageviewer.h +++ b/akregator/src/pageviewer.h @@ -42,7 +42,7 @@ namespace Akregator Q_OBJECT TQ_OBJECT public: - PageViewer(TQWidget* tqparent, const char* name); + PageViewer(TQWidget* parent, const char* name); virtual ~PageViewer(); virtual bool openURL(const KURL &url); diff --git a/akregator/src/plugin.h b/akregator/src/plugin.h index 2d615ccbd..650a4a924 100644 --- a/akregator/src/plugin.h +++ b/akregator/src/plugin.h @@ -26,10 +26,10 @@ namespace Akregator virtual bool init() = 0; /** - * TODO @param tqparent you must tqparent the widget to tqparent + * TODO @param parent you must parent the widget to parent * @return the configure widget for your plugin, create it on the heap! */ - //TODO rename configureWidget( TQWidget *tqparent ) + //TODO rename configureWidget( TQWidget *parent ) // virtual PluginConfig* configure() const { return 0; } void addPluginProperty( const TQString& key, const TQString& value ); diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index e3ce7b1e9..b5b732bae 100644 --- a/akregator/src/propertiesdialog.cpp +++ b/akregator/src/propertiesdialog.cpp @@ -38,8 +38,8 @@ namespace Akregator { -FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *tqparent, const char *name) - : FeedPropertiesWidgetBase(tqparent, name) +FeedPropertiesWidget::FeedPropertiesWidget(TQWidget *parent, const char *name) + : FeedPropertiesWidgetBase(parent, name) { } @@ -65,8 +65,8 @@ void FeedPropertiesWidget::slotUpdateCheckBoxToggled( bool enabled ) } -FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *tqparent, const char *name) - : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel) +FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *parent, const char *name) + : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Feed Properties"), KDialogBase::Ok|KDialogBase::Cancel) { widget=new FeedPropertiesWidget(this); setMainWidget(widget); diff --git a/akregator/src/propertiesdialog.h b/akregator/src/propertiesdialog.h index 0c854c361..8be70c615 100644 --- a/akregator/src/propertiesdialog.h +++ b/akregator/src/propertiesdialog.h @@ -35,7 +35,7 @@ namespace Akregator Q_OBJECT TQ_OBJECT public: - FeedPropertiesWidget(TQWidget *tqparent = 0, const char *name = 0); + FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0); ~FeedPropertiesWidget(); virtual void slotUpdateComboBoxActivated(int index); virtual void slotUpdateCheckBoxToggled(bool enabled); @@ -47,7 +47,7 @@ namespace Akregator Q_OBJECT TQ_OBJECT public: - FeedPropertiesDialog(TQWidget *tqparent = 0, const char *name = 0); + FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0); ~FeedPropertiesDialog(); void setFeed(Feed* feed); diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index abb319af4..d6f9549a7 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -60,7 +60,7 @@ public: int delay; }; -SearchBar::SearchBar(TQWidget* tqparent, const char* name) : TQHBox(tqparent, name), d(new SearchBar::SearchBarPrivate) +SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), d(new SearchBar::SearchBarPrivate) { d->delay = 400; setMargin(2); diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h index 18cb5d07a..6aff87b54 100644 --- a/akregator/src/searchbar.h +++ b/akregator/src/searchbar.h @@ -44,7 +44,7 @@ class SearchBar : public TQHBox public: - SearchBar(TQWidget* tqparent=0, const char* name=0); + SearchBar(TQWidget* parent=0, const char* name=0); virtual ~SearchBar(); TQString text() const; diff --git a/akregator/src/settings_advanced.cpp b/akregator/src/settings_advanced.cpp index 0aea7367f..7a849ff9b 100644 --- a/akregator/src/settings_advanced.cpp +++ b/akregator/src/settings_advanced.cpp @@ -11,7 +11,7 @@ namespace Akregator { -SettingsAdvanced::SettingsAdvanced(TQWidget* tqparent, const char* name) : SettingsAdvancedBase(tqparent, name) +SettingsAdvanced::SettingsAdvanced(TQWidget* parent, const char* name) : SettingsAdvancedBase(parent, name) { TQStringList backends = Backend::StorageFactoryRegistry::self()->list(); diff --git a/akregator/src/settings_advanced.h b/akregator/src/settings_advanced.h index 2186645de..e8873cfa1 100644 --- a/akregator/src/settings_advanced.h +++ b/akregator/src/settings_advanced.h @@ -21,7 +21,7 @@ class SettingsAdvanced : public SettingsAdvancedBase TQ_OBJECT public: - SettingsAdvanced(TQWidget* tqparent=0, const char* name=0); + SettingsAdvanced(TQWidget* parent=0, const char* name=0); /** returns the key of the currently selected factory */ TQString selectedFactory() const; diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index c4e91e5a6..5370bebef 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -44,8 +44,8 @@ class SelectNodeDialog::SelectNodeDialogPrivate SimpleNodeSelector* widget; }; -SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* tqparent, char* name) : - KDialogBase(tqparent, name, true, i18n("Select Feed or Folder"), +SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* parent, char* name) : + KDialogBase(parent, name, true, i18n("Select Feed or Folder"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), d(new SelectNodeDialogPrivate) { d->widget = new SimpleNodeSelector(feedList, this); @@ -111,7 +111,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor virtual bool visitTreeNode(TreeNode* node) { - TQListViewItem* pi = node->tqparent() ? m_view->d->nodeToItem[node->tqparent()] : 0; + TQListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : 0; KListViewItem* item = 0; if (pi != 0) @@ -131,7 +131,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor }; -SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* tqparent, const char* name) : TQWidget(tqparent, name), d(new SimpleNodeSelectorPrivate) +SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, const char* name) : TQWidget(parent, name), d(new SimpleNodeSelectorPrivate) { d->list = feedList; connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*))); diff --git a/akregator/src/simplenodeselector.h b/akregator/src/simplenodeselector.h index 97e87fda3..ccdacb84b 100644 --- a/akregator/src/simplenodeselector.h +++ b/akregator/src/simplenodeselector.h @@ -46,7 +46,7 @@ class SelectNodeDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - SelectNodeDialog(FeedList* feedList, TQWidget* tqparent=0, char* name=0); + SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0); virtual ~SelectNodeDialog(); TreeNode* selectedNode() const; @@ -70,7 +70,7 @@ class SimpleNodeSelector : public TQWidget TQ_OBJECT public: - SimpleNodeSelector(FeedList* feedList, TQWidget* tqparent=0, const char* name=0); + SimpleNodeSelector(FeedList* feedList, TQWidget* parent=0, const char* name=0); virtual ~SimpleNodeSelector(); TreeNode* selectedNode() const; diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index cbd7e737a..be7857b6a 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -63,8 +63,8 @@ class TabWidget::TabWidgetPrivate TQToolButton* tabsClose; }; -TabWidget::TabWidget(TQWidget * tqparent, const char *name) - :KTabWidget(tqparent, name), d(new TabWidgetPrivate) +TabWidget::TabWidget(TQWidget * parent, const char *name) + :KTabWidget(parent, name), d(new TabWidgetPrivate) { d->CurrentMaxLength = 30; d->currentItem = 0; diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h index bd357ad01..ec7168c59 100644 --- a/akregator/src/tabwidget.h +++ b/akregator/src/tabwidget.h @@ -41,7 +41,7 @@ class TabWidget : public KTabWidget TQ_OBJECT public: - TabWidget(TQWidget * tqparent = 0, const char *name = 0); + TabWidget(TQWidget * parent = 0, const char *name = 0); virtual ~TabWidget(); void addFrame(Frame *f); diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index 75ce305ea..d9c29a988 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -44,9 +44,9 @@ class TagAction::TagActionPrivate //TQMap<TQPopupMenu*, int> popupToId; }; -TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *tqparent) -//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name=0) - : KToggleAction(tag.name(), KShortcut(), 0, 0, tqparent), d(new TagActionPrivate) +TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent) +//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0) + : KToggleAction(tag.name(), KShortcut(), 0, 0, parent), d(new TagActionPrivate) { d->tag = tag; connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot); diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h index f87606395..43142ecc4 100644 --- a/akregator/src/tagaction.h +++ b/akregator/src/tagaction.h @@ -42,7 +42,7 @@ class TagAction : public KToggleAction public: - TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *tqparent=0); + TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent=0); virtual ~TagAction(); //virtual int plug(TQWidget *widget, int index=-1); diff --git a/akregator/src/tagfolder.cpp b/akregator/src/tagfolder.cpp index bb361fce6..7aa8190fb 100644 --- a/akregator/src/tagfolder.cpp +++ b/akregator/src/tagfolder.cpp @@ -52,7 +52,7 @@ bool TagFolder::accept(TreeNodeVisitor* visitor) return visitor->visitFolder(this); } -TQDomElement TagFolder::toOPML( TQDomElement /*tqparent*/, TQDomDocument /*document*/ ) const +TQDomElement TagFolder::toOPML( TQDomElement /*parent*/, TQDomDocument /*document*/ ) const { return TQDomElement(); } diff --git a/akregator/src/tagfolder.h b/akregator/src/tagfolder.h index 1c883ff05..49a8ddf72 100644 --- a/akregator/src/tagfolder.h +++ b/akregator/src/tagfolder.h @@ -43,7 +43,7 @@ class TagFolder : public Folder virtual ~TagFolder(); virtual bool accept(TreeNodeVisitor* visitor); - virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; private: class TagFolderPrivate; diff --git a/akregator/src/tagfolderitem.cpp b/akregator/src/tagfolderitem.cpp index fe57de4a4..09fcf0c2b 100644 --- a/akregator/src/tagfolderitem.cpp +++ b/akregator/src/tagfolderitem.cpp @@ -33,19 +33,19 @@ namespace Akregator { -TagFolderItem::TagFolderItem(FolderItem* tqparent, TagFolder* node) : FolderItem(tqparent, node) +TagFolderItem::TagFolderItem(FolderItem* parent, TagFolder* node) : FolderItem(parent, node) { } -TagFolderItem::TagFolderItem(FolderItem* tqparent, TreeNodeItem* after, TagFolder* node) : FolderItem(tqparent, after, node) +TagFolderItem::TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node) { } -TagFolderItem::TagFolderItem(KListView* tqparent, TagFolder* node) : FolderItem(tqparent, node) +TagFolderItem::TagFolderItem(KListView* parent, TagFolder* node) : FolderItem(parent, node) { } -TagFolderItem::TagFolderItem(KListView* tqparent, TreeNodeItem* after, TagFolder* node) : FolderItem(tqparent, after, node) +TagFolderItem::TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node) { } diff --git a/akregator/src/tagfolderitem.h b/akregator/src/tagfolderitem.h index 6cdefa3d5..fc9102666 100644 --- a/akregator/src/tagfolderitem.h +++ b/akregator/src/tagfolderitem.h @@ -40,10 +40,10 @@ class TagFolderItem : public FolderItem { public: - TagFolderItem(FolderItem* tqparent, TagFolder* node); - TagFolderItem(FolderItem* tqparent, TreeNodeItem* after, TagFolder* node); - TagFolderItem(KListView* tqparent, TagFolder* node); - TagFolderItem(KListView* tqparent, TreeNodeItem* after, TagFolder* node); + TagFolderItem(FolderItem* parent, TagFolder* node); + TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node); + TagFolderItem(KListView* parent, TagFolder* node); + TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node); virtual ~TagFolderItem(); virtual TagFolder* node(); diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp index 24d81755a..55273f727 100644 --- a/akregator/src/tagnode.cpp +++ b/akregator/src/tagnode.cpp @@ -131,7 +131,7 @@ TQStringList TagNode::tags() const return TQStringList(); } -TQDomElement TagNode::toOPML( TQDomElement tqparent, TQDomDocument document ) const +TQDomElement TagNode::toOPML( TQDomElement parent, TQDomDocument document ) const { return TQDomElement(); } @@ -141,13 +141,13 @@ TreeNode* TagNode::next() if ( nextSibling() ) return nextSibling(); - Folder* p = tqparent(); + Folder* p = parent(); while (p) { if ( p->nextSibling() ) return p->nextSibling(); else - p = p->tqparent(); + p = p->parent(); } return 0; } diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h index ebdf15a00..db3d82251 100644 --- a/akregator/src/tagnode.h +++ b/akregator/src/tagnode.h @@ -93,7 +93,7 @@ public: /** reimplemented to return an invalid element */ - virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const; + virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; /** returns the next node in the tree. Calling next() unless it returns 0 iterates through the tree in pre-order diff --git a/akregator/src/tagnodeitem.cpp b/akregator/src/tagnodeitem.cpp index ec083145c..90e05ba2f 100644 --- a/akregator/src/tagnodeitem.cpp +++ b/akregator/src/tagnodeitem.cpp @@ -35,22 +35,22 @@ namespace Akregator { -TagNodeItem::TagNodeItem(FolderItem* tqparent, TagNode* node) : TreeNodeItem(tqparent, node) +TagNodeItem::TagNodeItem(FolderItem* parent, TagNode* node) : TreeNodeItem(parent, node) { initialize(node); } -TagNodeItem::TagNodeItem(FolderItem* tqparent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(tqparent, after, node) +TagNodeItem::TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node) { initialize(node); } -TagNodeItem::TagNodeItem(KListView* tqparent, TagNode* node) : TreeNodeItem(tqparent, node) +TagNodeItem::TagNodeItem(KListView* parent, TagNode* node) : TreeNodeItem(parent, node) { initialize(node); } -TagNodeItem::TagNodeItem(KListView* tqparent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(tqparent, after, node) +TagNodeItem::TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node) { initialize(node); } diff --git a/akregator/src/tagnodeitem.h b/akregator/src/tagnodeitem.h index f5ea5edf5..a2719bb30 100644 --- a/akregator/src/tagnodeitem.h +++ b/akregator/src/tagnodeitem.h @@ -37,10 +37,10 @@ class TagNodeItem : public TreeNodeItem { public: - TagNodeItem(FolderItem* tqparent, TagNode* node); - TagNodeItem(FolderItem* tqparent, TreeNodeItem* after, TagNode* node); - TagNodeItem(KListView* tqparent, TagNode* node); - TagNodeItem(KListView* tqparent, TreeNodeItem* after, TagNode* node); + TagNodeItem(FolderItem* parent, TagNode* node); + TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node); + TagNodeItem(KListView* parent, TagNode* node); + TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node); virtual ~TagNodeItem(); virtual void nodeChanged(); diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp index cf87b7707..46acb9d1b 100644 --- a/akregator/src/tagnodelist.cpp +++ b/akregator/src/tagnodelist.cpp @@ -142,14 +142,14 @@ void TagNodeList::slotNodeAdded(TreeNode* node) } } -void TagNodeList::slotNodeRemoved(Folder* tqparent, TreeNode* node) +void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node) { - NodeList::slotNodeRemoved(tqparent, node); + NodeList::slotNodeRemoved(parent, node); TagNode* tagNode = dynamic_cast<TagNode*>(node); TQString id = tagNode ? tagNode->tag().id() : TQString(); - if (tqparent == rootNode() && tagNode != 0L && containsTagId(id)) + if (parent == rootNode() && tagNode != 0L && containsTagId(id)) { d->tagIdToNodeMap.remove(id); emit signalTagNodeRemoved(tagNode); diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h index 02d1bf8b0..5f06f455b 100644 --- a/akregator/src/tagnodelist.h +++ b/akregator/src/tagnodelist.h @@ -80,7 +80,7 @@ namespace Akregator { virtual void slotNodeDestroyed(TreeNode* node); virtual void slotNodeAdded(TreeNode* node); - virtual void slotNodeRemoved(Folder* tqparent, TreeNode* node); + virtual void slotNodeRemoved(Folder* parent, TreeNode* node); private: diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp index f14b7494b..531b7ff9f 100644 --- a/akregator/src/tagpropertiesdialog.cpp +++ b/akregator/src/tagpropertiesdialog.cpp @@ -40,7 +40,7 @@ class TagPropertiesDialog::TagPropertiesDialogPrivate TagPropertiesWidgetBase* widget; }; -TagPropertiesDialog::TagPropertiesDialog(TQWidget *tqparent, const char *name) : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Tag Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply), d(new TagPropertiesDialogPrivate) +TagPropertiesDialog::TagPropertiesDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Tag Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply), d(new TagPropertiesDialogPrivate) { d->widget = new TagPropertiesWidgetBase(this); setMainWidget(d->widget); diff --git a/akregator/src/tagpropertiesdialog.h b/akregator/src/tagpropertiesdialog.h index 3665bbe44..1dffd8dac 100644 --- a/akregator/src/tagpropertiesdialog.h +++ b/akregator/src/tagpropertiesdialog.h @@ -38,7 +38,7 @@ class TagPropertiesDialog : public KDialogBase public: - TagPropertiesDialog(TQWidget *tqparent=0, const char *name=0); + TagPropertiesDialog(TQWidget *parent=0, const char *name=0); virtual ~TagPropertiesDialog(); void setTag(const Tag& tag); diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp index a6b412856..fd1cd42f0 100644 --- a/akregator/src/tagset.cpp +++ b/akregator/src/tagset.cpp @@ -38,7 +38,7 @@ class TagSet::TagSetPrivate TQMap<TQString,Tag> map; }; -TagSet::TagSet(TQObject* tqparent) : TQObject(tqparent), d(new TagSetPrivate) +TagSet::TagSet(TQObject* parent) : TQObject(parent), d(new TagSetPrivate) { } diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h index 49b19aed9..4a1c83247 100644 --- a/akregator/src/tagset.h +++ b/akregator/src/tagset.h @@ -51,7 +51,7 @@ class TagSet : public TQObject TQ_OBJECT public: - TagSet(TQObject* tqparent=0); + TagSet(TQObject* parent=0); virtual ~TagSet(); /** adds a tag to the tag set. The tag set will emit signalTagAdded */ diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index e48593354..e2fb42274 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -57,8 +57,8 @@ void TrayIcon::setInstance(TrayIcon* trayIcon) } -TrayIcon::TrayIcon(TQWidget *tqparent, const char *name) - : KSystemTray(tqparent, name), m_unread(0) +TrayIcon::TrayIcon(TQWidget *parent, const char *name) + : KSystemTray(parent, name), m_unread(0) { m_defaultIcon=KSystemTray::loadIcon("akregator"); TQPixmap m_unreadIcon=KSystemTray::loadIcon("akregator_empty"); @@ -177,7 +177,7 @@ void TrayIcon::slotSetUnread(int unread) void TrayIcon::viewButtonClicked() { - TQWidget *p=TQT_TQWIDGET(tqparent()); + TQWidget *p=TQT_TQWIDGET(parent()); KWin::forceActiveWindow(p->winId()); } diff --git a/akregator/src/trayicon.h b/akregator/src/trayicon.h index 316d938b0..4af30613c 100644 --- a/akregator/src/trayicon.h +++ b/akregator/src/trayicon.h @@ -40,7 +40,7 @@ namespace Akregator static TrayIcon* getInstance(); static void setInstance(TrayIcon* trayIcon); - TrayIcon(TQWidget *tqparent = 0, const char *name = 0); + TrayIcon(TQWidget *parent = 0, const char *name = 0); ~TrayIcon(); TQPixmap takeScreenshot() const; diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp index 58e4ae8ea..9cc716b45 100644 --- a/akregator/src/treenode.cpp +++ b/akregator/src/treenode.cpp @@ -40,7 +40,7 @@ class TreeNode::TreeNodePrivate bool nodeChangeOccurred; bool articleChangeOccurred; TQString title; - Folder* tqparent; + Folder* parent; uint id; bool signalDestroyedEmitted; }; @@ -52,7 +52,7 @@ TreeNode::TreeNode() d->nodeChangeOccurred = false; d->articleChangeOccurred = false; d->title = ""; - d->tqparent = 0; + d->parent = 0; d->id = 0; d->signalDestroyedEmitted = false; @@ -91,9 +91,9 @@ void TreeNode::setTitle(const TQString& title) TreeNode* TreeNode::nextSibling() const { - if (!d->tqparent) + if (!d->parent) return 0; - TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren(); + TQValueList<TreeNode*> tqchildren = d->parent->tqchildren(); TreeNode* me = (TreeNode*)this; int idx = tqchildren.findIndex(me); @@ -103,23 +103,23 @@ TreeNode* TreeNode::nextSibling() const TreeNode* TreeNode::prevSibling() const { - if (!d->tqparent) + if (!d->parent) return 0; - TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren(); + TQValueList<TreeNode*> tqchildren = d->parent->tqchildren(); TreeNode* me = (TreeNode*)this; int idx = tqchildren.findIndex(me); - return idx > 0 ? *(d->tqparent->tqchildren().at(idx-1)) : 0L; + return idx > 0 ? *(d->parent->tqchildren().at(idx-1)) : 0L; } -Folder* TreeNode::tqparent() const +Folder* TreeNode::parent() const { - return d->tqparent; + return d->parent; } -void TreeNode::setParent(Folder* tqparent) +void TreeNode::setParent(Folder* parent) { - d->tqparent = tqparent; + d->parent = parent; } void TreeNode::setNotificationMode(bool doNotify, bool notifyOccurredChanges) diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h index b50b050a6..305bc5d47 100644 --- a/akregator/src/treenode.h +++ b/akregator/src/treenode.h @@ -100,16 +100,16 @@ public: virtual TreeNode* prevSibling() const; - /** Returns the tqparent node. - @return the tqparent feed group, 0 if there is none */ + /** Returns the parent node. + @return the parent feed group, 0 if there is none */ - virtual Folder* tqparent() const; + virtual Folder* parent() const; - /** Sets tqparent node; Don't call this directly, is done automatically by + /** Sets parent node; Don't call this directly, is done automatically by insertChild-methods in @ref Folder. */ - virtual void setParent(Folder* tqparent); + virtual void setParent(Folder* parent); /** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree. @@ -128,10 +128,10 @@ public: virtual bool isGroup() const = 0; /** exports node and child nodes to OPML (with akregator settings) - @param tqparent the dom element the child node will be attached to + @param parent the dom element the child node will be attached to @param document the opml document */ - virtual TQDomElement toOPML( TQDomElement tqparent, TQDomDocument document ) const = 0; + virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const = 0; /** @param doNotify notification on changes on/off flag diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp index a5955a9f7..32b12c9c5 100644 --- a/akregator/src/treenodeitem.cpp +++ b/akregator/src/treenodeitem.cpp @@ -36,25 +36,25 @@ namespace Akregator { -TreeNodeItem::TreeNodeItem(FolderItem* tqparent, TreeNode* node) - : KListViewItem(tqparent), m_node(node) +TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNode* node) + : KListViewItem(parent), m_node(node) { initialize(node); } -TreeNodeItem::TreeNodeItem(KListView* tqparent, TreeNode* node) - : KListViewItem(tqparent), m_node(node) +TreeNodeItem::TreeNodeItem(KListView* parent, TreeNode* node) + : KListViewItem(parent), m_node(node) { initialize(node); } -TreeNodeItem::TreeNodeItem(KListView* tqparent, TreeNodeItem* after, TreeNode* node) : KListViewItem(tqparent, after), m_node(node) +TreeNodeItem::TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node) : KListViewItem(parent, after), m_node(node) { initialize(node); } -TreeNodeItem::TreeNodeItem(FolderItem* tqparent, TreeNodeItem* after, TreeNode* node) - : KListViewItem(tqparent, after), m_node(node) +TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node) + : KListViewItem(parent, after), m_node(node) { initialize(node); } @@ -99,9 +99,9 @@ TreeNodeItem* TreeNodeItem::nextSibling() const return static_cast<TreeNodeItem*>(KListViewItem::nextSibling()); } -FolderItem* TreeNodeItem::tqparent() const +FolderItem* TreeNodeItem::parent() const { - return static_cast<FolderItem*>(KListViewItem::tqparent()); + return static_cast<FolderItem*>(KListViewItem::parent()); } diff --git a/akregator/src/treenodeitem.h b/akregator/src/treenodeitem.h index 3b263d734..386da0d5d 100644 --- a/akregator/src/treenodeitem.h +++ b/akregator/src/treenodeitem.h @@ -43,10 +43,10 @@ class TreeNodeItem : public KListViewItem public: - TreeNodeItem(FolderItem* tqparent, TreeNode* node); - TreeNodeItem(FolderItem* tqparent, TreeNodeItem* after, TreeNode* node); - TreeNodeItem(KListView* tqparent, TreeNode* node); - TreeNodeItem(KListView* tqparent, TreeNodeItem* after, TreeNode* node); + TreeNodeItem(FolderItem* parent, TreeNode* node); + TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node); + TreeNodeItem(KListView* parent, TreeNode* node); + TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node); virtual ~TreeNodeItem(); virtual TreeNode* node(); @@ -55,7 +55,7 @@ public: virtual TQString toolTip() const; virtual TreeNodeItem* firstChild() const; virtual TreeNodeItem* nextSibling() const; - virtual FolderItem* tqparent() const; + virtual FolderItem* parent() const; virtual void showContextMenu(const TQPoint& p) = 0; diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 4302f0a7e..d24e715f8 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -47,8 +47,8 @@ namespace Akregator { -Viewer::Viewer(TQWidget *tqparent, const char *name) - : KHTMLPart(tqparent, name), m_url(0) +Viewer::Viewer(TQWidget *parent, const char *name) + : KHTMLPart(parent, name), m_url(0) { setZoomFactor(100); setMetaRefreshEnabled(true); diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h index c6e2c4432..d01949c9b 100644 --- a/akregator/src/viewer.h +++ b/akregator/src/viewer.h @@ -47,7 +47,7 @@ namespace Akregator */ static void displayInExternalBrowser(const KURL &url, const TQString& mimetype=TQString()); - Viewer(TQWidget* tqparent, const char* name); + Viewer(TQWidget* parent, const char* name); virtual ~Viewer(); virtual bool closeURL(); diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index b661eeeda..1cf5a2b4b 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -69,8 +69,8 @@ #include <assert.h> CertificateInfoWidgetImpl::CertificateInfoWidgetImpl( const GpgME::Key & key, bool external, - TQWidget * tqparent, const char * name ) - : CertificateInfoWidget( tqparent, name ), + TQWidget * parent, const char * name ) + : CertificateInfoWidget( parent, name ), mExternal( external ), mFoundIssuer( true ), mHaveKeyLocally( false ) @@ -182,14 +182,14 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key ) { startCertificateDump(); } -static void showChainListError( TQWidget * tqparent, const GpgME::Error & err, const char * subject ) { +static void showChainListError( TQWidget * parent, const GpgME::Error & err, const char * subject ) { assert( err ); const TQString msg = i18n("<qt><p>An error occurred while fetching " "the certificate <b>%1</b> from the backend:</p>" "<p><b>%2</b></p></qt>") .tqarg( subject ? TQString::fromUtf8( subject ) : TQString(), TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n("Certificate Listing Failed" ) ); + KMessageBox::error( parent, msg, i18n("Certificate Listing Failed" ) ); } void CertificateInfoWidgetImpl::startCertificateChainListing() { diff --git a/certmanager/certificateinfowidgetimpl.h b/certmanager/certificateinfowidgetimpl.h index d7e2f3151..f58553c1e 100644 --- a/certmanager/certificateinfowidgetimpl.h +++ b/certmanager/certificateinfowidgetimpl.h @@ -51,7 +51,7 @@ class CertificateInfoWidgetImpl : public CertificateInfoWidget { TQ_OBJECT public: CertificateInfoWidgetImpl( const GpgME::Key & key, bool external, - TQWidget * tqparent=0, const char * name=0); + TQWidget * parent=0, const char * name=0); void setKey( const GpgME::Key & key ); diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 4924cd0b2..d24c7df99 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -108,14 +108,14 @@ static bool availForMod( const TQLineEdit * le ) { } /* - * Constructs a CertificateWizardImpl which is a child of 'tqparent', with the + * Constructs a CertificateWizardImpl which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The wizard will by default be modeless, unless you set 'modal' to * TRUE to construct a modal wizard. */ -CertificateWizardImpl::CertificateWizardImpl( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : CertificateWizard( tqparent, name, modal, fl ) +CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : CertificateWizard( parent, name, modal, fl ) { // don't allow to go to last page until a key has been generated setNextEnabled( generatePage, false ); diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h index 18aa5f685..6db2d2eef 100644 --- a/certmanager/certificatewizardimpl.h +++ b/certmanager/certificatewizardimpl.h @@ -52,7 +52,7 @@ class CertificateWizardImpl : public CertificateWizard TQ_OBJECT public: - CertificateWizardImpl( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CertificateWizardImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CertificateWizardImpl(); bool sendToCA() const; diff --git a/certmanager/certlistview.cpp b/certmanager/certlistview.cpp index 73f3ecdd6..f26ba17f8 100644 --- a/certmanager/certlistview.cpp +++ b/certmanager/certlistview.cpp @@ -5,8 +5,8 @@ CertKeyListView::CertKeyListView( const ColumnStrategy * strategy, const DisplayStrategy * display, - TQWidget * tqparent, const char * name, WFlags f ) - : Kleo::KeyListView( strategy, display, tqparent, name, f ) + TQWidget * parent, const char * name, WFlags f ) + : Kleo::KeyListView( strategy, display, parent, name, f ) { viewport()->setAcceptDrops( true ); } diff --git a/certmanager/certlistview.h b/certmanager/certlistview.h index 3434fc478..ad489a85a 100644 --- a/certmanager/certlistview.h +++ b/certmanager/certlistview.h @@ -12,7 +12,7 @@ class CertKeyListView : public Kleo::KeyListView { public: CertKeyListView( const ColumnStrategy * strategy, const DisplayStrategy * display=0, - TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + TQWidget * parent=0, const char * name=0, WFlags f=0 ); signals: void dropped( const KURL::List& urls ); diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 7c80966a8..5304b131a 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -161,8 +161,8 @@ namespace { } // anon namespace CertManager::CertManager( bool remote, const TQString& query, const TQString & import, - TQWidget* tqparent, const char* name, WFlags f ) - : KMainWindow( tqparent, name, f|WDestructiveClose ), + TQWidget* parent, const char* name, WFlags f ) + : KMainWindow( parent, name, f|WDestructiveClose ), mCrlView( 0 ), mDirmngrProc( 0 ), mHierarchyAnalyser( 0 ), @@ -527,14 +527,14 @@ void CertManager::slotRefreshKeysResult( const GpgME::Error & err ) { i18n("Refreshing Keys Failed") ); } -static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) { +static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { assert( err ); const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the certificates from the backend:</p>" "<p><b>%1</b></p></qt>" ) .tqarg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n( "Certificate Listing Failed" ) ); + KMessageBox::error( parent, msg, i18n( "Certificate Listing Failed" ) ); } void CertManager::slotSearch() { @@ -700,7 +700,7 @@ void CertManager::slotImportResult( KIO::Job* job ) updateImportActions( true ); } -static void showCertificateDownloadError( TQWidget * tqparent, const GpgME::Error & err, const TQString& certDisplayName ) { +static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error & err, const TQString& certDisplayName ) { assert( err ); const TQString msg = i18n( "<qt><p>An error occurred while trying " "to download the certificate %1:</p>" @@ -708,7 +708,7 @@ static void showCertificateDownloadError( TQWidget * tqparent, const GpgME::Erro .tqarg( certDisplayName ) .tqarg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n( "Certificate Download Failed" ) ); + KMessageBox::error( parent, msg, i18n( "Certificate Download Failed" ) ); } void CertManager::slotDownloadCertificate() { @@ -768,14 +768,14 @@ void CertManager::slotCertificateDownloadResult( const GpgME::Error & err, const disconnectJobFromStatusBarProgress( err ); } -static void showCertificateImportError( TQWidget * tqparent, const GpgME::Error & err, const TQString& certDisplayName ) { +static void showCertificateImportError( TQWidget * parent, const GpgME::Error & err, const TQString& certDisplayName ) { assert( err ); const TQString msg = i18n( "<qt><p>An error occurred while trying " "to import the certificate %1:</p>" "<p><b>%2</b></p></qt>" ) .tqarg( certDisplayName ) .tqarg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n( "Certificate Import Failed" ) ); + KMessageBox::error( parent, msg, i18n( "Certificate Import Failed" ) ); } void CertManager::startCertificateImport( const TQByteArray & keyData, const TQString& certDisplayName ) { @@ -998,13 +998,13 @@ void CertManager::slotClearCRLsResult() { delete mDirmngrProc; mDirmngrProc = 0; } -static void showDeleteError( TQWidget * tqparent, const GpgME::Error & err ) { +static void showDeleteError( TQWidget * parent, const GpgME::Error & err ) { assert( err ); const TQString msg = i18n("<qt><p>An error occurred while trying to delete " "the certificates:</p>" "<p><b>%1</b></p></qt>") .tqarg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n("Certificate Deletion Failed") ); + KMessageBox::error( parent, msg, i18n("Certificate Deletion Failed") ); } static bool ByFingerprint( const GpgME::Key & left, const GpgME::Key & right ) { @@ -1201,13 +1201,13 @@ void CertManager::slotExportCertificate() { startCertificateExport( fingerprints ); } -static void showCertificateExportError( TQWidget * tqparent, const GpgME::Error & err ) { +static void showCertificateExportError( TQWidget * parent, const GpgME::Error & err ) { assert( err ); const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the certificate:</p>" "<p><b>%1</b></p></qt>") .tqarg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n("Certificate Export Failed") ); + KMessageBox::error( parent, msg, i18n("Certificate Export Failed") ); } void CertManager::startCertificateExport( const TQStringList & fingerprints ) { @@ -1296,13 +1296,13 @@ void CertManager::slotExportSecretKey() { startSecretKeyExport( dlg.fingerprint() ); } -static void showSecretKeyExportError( TQWidget * tqparent, const GpgME::Error & err ) { +static void showSecretKeyExportError( TQWidget * parent, const GpgME::Error & err ) { assert( err ); const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the secret key:</p>" "<p><b>%1</b></p></qt>") .tqarg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n("Secret-Key Export Failed") ); + KMessageBox::error( parent, msg, i18n("Secret-Key Export Failed") ); } void CertManager::startSecretKeyExport( const TQString & fingerprint ) { diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index ef27db6e3..2ef6b78fb 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -82,7 +82,7 @@ class KDE_EXPORT CertManager : public KMainWindow { public: CertManager( bool remote = false, const TQString& query = TQString(), const TQString& import=TQString(), - TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~CertManager(); bool isRemote() const { return mRemote; } diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 90720508a..cbb64ef21 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -38,8 +38,8 @@ #include <kdepimmacros.h> -AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * tqparent, const char * name ) - : KCModule( tqparent, name ) +AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name ) + : KCModule( parent, name ) { TQVBoxLayout* lay = new TQVBoxLayout( this ); mWidget = new Kleo::AppearanceConfigWidget( this ); @@ -70,10 +70,10 @@ void AppearanceConfigurationPage::defaults() extern "C" { - KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *parent, const char * ) { AppearanceConfigurationPage *page = - new AppearanceConfigurationPage( tqparent, "kleopatra_config_appear" ); + new AppearanceConfigurationPage( parent, "kleopatra_config_appear" ); return page; } } diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h index 90c6bc13d..927f4eaf1 100644 --- a/certmanager/conf/appearanceconfigpage.h +++ b/certmanager/conf/appearanceconfigpage.h @@ -45,7 +45,7 @@ class AppearanceConfigurationPage : public KCModule { Q_OBJECT TQ_OBJECT public: - AppearanceConfigurationPage( TQWidget * tqparent=0, const char * name=0 ); + AppearanceConfigurationPage( TQWidget * parent=0, const char * name=0 ); virtual void load(); virtual void save(); diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp index 33f4189b8..309d03be1 100644 --- a/certmanager/conf/appearanceconfigwidget.cpp +++ b/certmanager/conf/appearanceconfigwidget.cpp @@ -178,8 +178,8 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in //// Kleo::AppearanceConfigWidget::AppearanceConfigWidget ( - TQWidget* tqparent, const char* name, WFlags fl ) - : AppearanceConfigWidgetBase( tqparent, name, fl ) + TQWidget* parent, const char* name, WFlags fl ) + : AppearanceConfigWidgetBase( parent, name, fl ) { categoriesLV->setSorting( -1 ); load(); diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h index 917a1cfbf..95c07c247 100644 --- a/certmanager/conf/appearanceconfigwidget.h +++ b/certmanager/conf/appearanceconfigwidget.h @@ -46,7 +46,7 @@ namespace Kleo { public: AppearanceConfigWidget( - TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~AppearanceConfigWidget(); void load(); diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp index 349f3070c..6a7b6a082 100644 --- a/certmanager/conf/configuredialog.cpp +++ b/certmanager/conf/configuredialog.cpp @@ -38,8 +38,8 @@ #include <kconfig.h> #include <klocale.h> -ConfigureDialog::ConfigureDialog( TQWidget *tqparent, const char *name, bool modal ) - : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), tqparent, name, modal ) +ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal ) + : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal ) { KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); showButton( User1, true ); diff --git a/certmanager/conf/configuredialog.h b/certmanager/conf/configuredialog.h index 456bc7807..55de6c5fd 100644 --- a/certmanager/conf/configuredialog.h +++ b/certmanager/conf/configuredialog.h @@ -42,7 +42,7 @@ class ConfigureDialog : public KCMultiDialog TQ_OBJECT public: - ConfigureDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true ); + ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true ); ~ConfigureDialog(); protected: diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index e95089d8e..b4babc504 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -137,8 +137,8 @@ static const char s_addnewservers_componentName[] = "dirmngr"; static const char s_addnewservers_groupName[] = "LDAP"; static const char s_addnewservers_entryName[] = "add-servers"; -DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget * tqparent, const char * name ) - : KCModule( tqparent, name ) +DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget * parent, const char * name ) + : KCModule( parent, name ) { mConfig = Kleo::CryptoBackendFactory::instance()->config(); TQVBoxLayout* lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -259,10 +259,10 @@ void DirectoryServicesConfigurationPage::defaults() extern "C" { - KDE_EXPORT KCModule *create_kleopatra_config_dirserv( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * ) { DirectoryServicesConfigurationPage *page = - new DirectoryServicesConfigurationPage( tqparent, "kleopatra_config_dirserv" ); + new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" ); return page; } } diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h index 24f5f9df0..be278643e 100644 --- a/certmanager/conf/dirservconfigpage.h +++ b/certmanager/conf/dirservconfigpage.h @@ -54,7 +54,7 @@ class KDE_EXPORT DirectoryServicesConfigurationPage : public KCModule { Q_OBJECT TQ_OBJECT public: - DirectoryServicesConfigurationPage( TQWidget * tqparent=0, const char * name=0 ); + DirectoryServicesConfigurationPage( TQWidget * parent=0, const char * name=0 ); virtual void load(); virtual void save(); diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index f84bb1e7c..8db3a005d 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -38,8 +38,8 @@ #include <tqlayout.h> -DNOrderConfigPage::DNOrderConfigPage( TQWidget * tqparent, const char * name ) - : KCModule( tqparent, name ) +DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name ) + : KCModule( parent, name ) { TQVBoxLayout * vlay = new TQVBoxLayout( this ); mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" ); @@ -70,8 +70,8 @@ void DNOrderConfigPage::slotChanged() { emit changed(true); } -extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( TQWidget * tqparent, const char * ) { - return new DNOrderConfigPage( tqparent, "kleopatra_config_dnorder" ); +extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) { + return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" ); } #include "dnorderconfigpage.moc" diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h index 5108b3a0b..1fa5ba5cc 100644 --- a/certmanager/conf/dnorderconfigpage.h +++ b/certmanager/conf/dnorderconfigpage.h @@ -45,7 +45,7 @@ class DNOrderConfigPage : public KCModule { Q_OBJECT TQ_OBJECT public: - DNOrderConfigPage( TQWidget * tqparent=0, const char * name=0 ); + DNOrderConfigPage( TQWidget * parent=0, const char * name=0 ); /*! reimplementation */ void load(); diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp index 6b46bef9a..3318f8ddf 100644 --- a/certmanager/crlview.cpp +++ b/certmanager/crlview.cpp @@ -49,8 +49,8 @@ #include <tqfontmetrics.h> #include <tqtimer.h> -CRLView::CRLView( TQWidget* tqparent, const char* name, bool modal ) - : TQDialog( tqparent, name, modal ), _process(0) +CRLView::CRLView( TQWidget* parent, const char* name, bool modal ) + : TQDialog( parent, name, modal ), _process(0) { TQVBoxLayout* topLayout = new TQVBoxLayout( this, 10, 4 ); diff --git a/certmanager/crlview.h b/certmanager/crlview.h index 41a78bfaf..8cf0c7049 100644 --- a/certmanager/crlview.h +++ b/certmanager/crlview.h @@ -45,7 +45,7 @@ class CRLView : public TQDialog { Q_OBJECT TQ_OBJECT public: - CRLView( TQWidget* tqparent = 0, const char* name = 0, bool modal = false ); + CRLView( TQWidget* parent = 0, const char* name = 0, bool modal = false ); ~CRLView(); public slots: void slotUpdateView(); diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp index 7289652bc..1e08876d6 100644 --- a/certmanager/customactions.cpp +++ b/certmanager/customactions.cpp @@ -39,9 +39,9 @@ #include <tqlabel.h> -LabelAction::LabelAction( const TQString & text, KActionCollection * tqparent, +LabelAction::LabelAction( const TQString & text, KActionCollection * parent, const char* name ) - : KAction( text, TQIconSet(), KShortcut(), 0, 0, tqparent, name ) + : KAction( text, TQIconSet(), KShortcut(), 0, 0, parent, name ) { } @@ -62,9 +62,9 @@ int LabelAction::plug( TQWidget * widget, int index ) { return KAction::plug( widget, index ); } -LineEditAction::LineEditAction( const TQString & text, KActionCollection * tqparent, +LineEditAction::LineEditAction( const TQString & text, KActionCollection * parent, TQObject * receiver, const char * member, const char * name ) - : KAction( text, TQIconSet(), KShortcut(), 0, 0, tqparent, name ), + : KAction( text, TQIconSet(), KShortcut(), 0, 0, parent, name ), _le(0), _receiver(receiver), _member(member) { @@ -108,10 +108,10 @@ void LineEditAction::setText( const TQString & txt ) { } -ComboAction::ComboAction( const TQStringList & lst, KActionCollection * tqparent, +ComboAction::ComboAction( const TQStringList & lst, KActionCollection * parent, TQObject * receiver, const char * member, const char * name, int selectedID ) - : KAction( TQString(), TQIconSet(), KShortcut(), 0, 0, tqparent, name ), + : KAction( TQString(), TQIconSet(), KShortcut(), 0, 0, parent, name ), _lst(lst), _receiver(receiver), _member(member), _selectedId( selectedID ) { diff --git a/certmanager/customactions.h b/certmanager/customactions.h index 6d6600fba..9cc242982 100644 --- a/certmanager/customactions.h +++ b/certmanager/customactions.h @@ -43,7 +43,7 @@ class LabelAction : public KAction { Q_OBJECT TQ_OBJECT public: - LabelAction( const TQString & text, KActionCollection * tqparent, + LabelAction( const TQString & text, KActionCollection * parent, const char* name ); int plug( TQWidget * widget, int index=-1 ); @@ -53,7 +53,7 @@ class LineEditAction : public KAction { Q_OBJECT TQ_OBJECT public: - LineEditAction( const TQString & text, KActionCollection * tqparent, + LineEditAction( const TQString & text, KActionCollection * parent, TQObject * receiver, const char * member, const char * name ); int plug( TQWidget * widget, int index=-1 ); @@ -71,7 +71,7 @@ class ComboAction : public KAction { Q_OBJECT TQ_OBJECT public: - ComboAction( const TQStringList & lst, KActionCollection * tqparent, + ComboAction( const TQStringList & lst, KActionCollection * parent, TQObject * receiver, const char * member, const char * name, int selectedID ); diff --git a/certmanager/hierarchyanalyser.cpp b/certmanager/hierarchyanalyser.cpp index 450c61814..fe0835ebf 100644 --- a/certmanager/hierarchyanalyser.cpp +++ b/certmanager/hierarchyanalyser.cpp @@ -39,8 +39,8 @@ #include <algorithm> #include <iterator> -HierarchyAnalyser::HierarchyAnalyser( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +HierarchyAnalyser::HierarchyAnalyser( TQObject * parent, const char * name ) + : TQObject( parent, name ) { } diff --git a/certmanager/hierarchyanalyser.h b/certmanager/hierarchyanalyser.h index a27d8a6cf..ccf10ff43 100644 --- a/certmanager/hierarchyanalyser.h +++ b/certmanager/hierarchyanalyser.h @@ -45,7 +45,7 @@ class HierarchyAnalyser : public TQObject { Q_OBJECT TQ_OBJECT public: - HierarchyAnalyser( TQObject * tqparent=0, const char * name=0 ); + HierarchyAnalyser( TQObject * parent=0, const char * name=0 ); ~HierarchyAnalyser(); const std::vector<GpgME::Key> & rootItems() const { diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 5edb1a422..20c474a44 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp @@ -66,9 +66,9 @@ static int log_level_to_int( const TQString& loglevel ) } } -KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* tqparent, const char* name ) +KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n("Configure KWatchGnuPG"), - Ok|Cancel, Ok, tqparent, name ) + Ok|Cancel, Ok, parent, name ) { // tmp vars: TQWidget * w; diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.h b/certmanager/kwatchgnupg/kwatchgnupgconfig.h index ac72ce1ba..72be289d5 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.h +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.h @@ -44,7 +44,7 @@ class KWatchGnuPGConfig : public KDialogBase { Q_OBJECT TQ_OBJECT public: - KWatchGnuPGConfig( TQWidget* tqparent, const char* name = 0 ); + KWatchGnuPGConfig( TQWidget* parent, const char* name = 0 ); void loadConfig(); void saveConfig(); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 4c6ecbfb5..e7690d4ff 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -58,8 +58,8 @@ #define WATCHGNUPGBINARY "watchgnupg" #define WATCHGNUPGSOCKET ( TQDir::home().canonicalPath() + "/.gnupg/log-socket") -KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* tqparent, const char* name ) - : KMainWindow( tqparent, name, WType_TopLevel ), mConfig(0) +KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name ) + : KMainWindow( parent, name, WType_TopLevel ), mConfig(0) { createActions(); createGUI(); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h index fc7776897..aa6feabc9 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h @@ -44,7 +44,7 @@ class KWatchGnuPGMainWindow : public KMainWindow { Q_OBJECT TQ_OBJECT public: - KWatchGnuPGMainWindow( TQWidget* tqparent = 0, const char* name = 0 ); + KWatchGnuPGMainWindow( TQWidget* parent = 0, const char* name = 0 ); virtual ~KWatchGnuPGMainWindow(); public slots: void slotWatcherExited(); diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index eb5a5ea38..9daaa620d 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -163,7 +163,7 @@ void Kleo::ChiasmusJob::showChiasmusOutput() { kdDebug() << k_funcinfo << endl; if ( mStderr.isEmpty() ) return; - KMessageBox::information( 0 /*how to get a tqparent widget?*/, + KMessageBox::information( 0 /*how to get a parent widget?*/, mStderr, i18n( "Output from chiasmus" ) ); } @@ -200,7 +200,7 @@ void Kleo::ChiasmusJob::slotTimeout() { } -void Kleo::ChiasmusJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::ChiasmusJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( !mError ) return; if ( mError.isCanceled() ) @@ -211,9 +211,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * tqparent, const TQString & c .tqarg( TQString::fromLocal8Bit( mError.asString() ) ); if ( !mStderr.isEmpty() ) { const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr ); - KMessageBox::detailedError( tqparent, msg, details, caption ); + KMessageBox::detailedError( parent, msg, details, caption ); } else { - KMessageBox::error( tqparent, msg, caption ); + KMessageBox::error( parent, msg, caption ); } } diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index 497a5a54d..eccdf9219 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -114,13 +114,13 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) { slotPerform( false ); } -void Kleo::ObtainKeysJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::ObtainKeysJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( !mError ) return; if ( mError.isCanceled() ) return; const TQString msg = TQString::fromUtf8( mError.asString() ); - KMessageBox::error( tqparent, msg, caption ); + KMessageBox::error( parent, msg, caption ); } #include "obtainkeysjob.moc" diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp index a2408a734..231cf6ad3 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp @@ -44,8 +44,8 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, const TQString & program, const TQString & keyFile, const TQString & options, Operation mode, - TQObject * tqparent, const char * name ) - : KProcess( tqparent, name ), + TQObject * parent, const char * name ) + : KProcess( parent, name ), mOperation( mode ), mOptions( options ) { *this << "symcryptrun" diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h index 2fb136fb1..b3a025fdf 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h @@ -51,7 +51,7 @@ public: SymCryptRunProcessBase( const TQString & class_, const TQString & program, const TQString & keyFile, const TQString& options, Operation op, - TQObject * tqparent=0, const char * name=0 ); + TQObject * parent=0, const char * name=0 ); ~SymCryptRunProcessBase(); bool launch( const TQByteArray & input, RunMode rm=NotifyOnExit ); diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index b1d55ac98..5ec4f4111 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -56,8 +56,8 @@ struct Kleo::GnuPGProcessBase::Private { }; -Kleo::GnuPGProcessBase::GnuPGProcessBase( TQObject * tqparent, const char * name ) - : KProcess( tqparent, name ) +Kleo::GnuPGProcessBase::GnuPGProcessBase( TQObject * parent, const char * name ) + : KProcess( parent, name ) { d = new Private(); } diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h index 46b7f2873..b6643144a 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h @@ -49,7 +49,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - GnuPGProcessBase( TQObject * tqparent=0, const char * name=0 ); + GnuPGProcessBase( TQObject * parent=0, const char * name=0 ); ~GnuPGProcessBase(); void setUseStatusFD( bool use ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp index 8350f19bb..480e6c8a5 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp @@ -103,9 +103,9 @@ void Kleo::QGpgMEEncryptJob::doOperationDoneEvent( const GpgME::Error & ) { emit result( mResult, ciphertext ); } -void Kleo::QGpgMEEncryptJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::QGpgMEEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( mResult.error() && !mResult.error().isCanceled() ) - Kleo::MessageBox::error( tqparent, mResult, this, caption ); + Kleo::MessageBox::error( parent, mResult, this, caption ); } #include "qgpgmeencryptjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h index 640ff8c35..c367c3525 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h @@ -66,7 +66,7 @@ namespace Kleo { TQByteArray & cipherText ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; + void showErrorDialog( TQWidget * parent, const TQString & caption ) const; private slots: void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) { diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index 57afed412..d1d2591da 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -190,14 +190,14 @@ void Kleo::QGpgMEKeyListJob::slotOperationDoneEvent( GpgME::Context * context, c deleteLater(); } -void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( !mResult.error() || mResult.error().isCanceled() ) return; const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) .tqarg( TQString::fromLocal8Bit( mResult.error().asString() ) ); - KMessageBox::error( tqparent, msg, caption ); + KMessageBox::error( parent, msg, caption ); } #include "qgpgmekeylistjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h index cf0b3086b..c695967e8 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h @@ -61,7 +61,7 @@ namespace Kleo { GpgME::KeyListResult exec( const TQStringList & patterns, bool secretOnly, std::vector<GpgME::Key> & keys ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; + void showErrorDialog( TQWidget * parent, const TQString & caption ) const; private slots: void slotNextKeyEvent( GpgME::Context * context, const GpgME::Key & key ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp index 28901c303..d5fa009db 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp @@ -114,10 +114,10 @@ void Kleo::QGpgMESignEncryptJob::doOperationDoneEvent( const GpgME::Error & ) { emit result( mResult.first, mResult.second, cipherText ); } -void Kleo::QGpgMESignEncryptJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::QGpgMESignEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( mResult.first.error() && !mResult.first.error().isCanceled() || mResult.second.error() && !mResult.second.error().isCanceled() ) - Kleo::MessageBox::error( tqparent, mResult.first, mResult.second, this, caption ); + Kleo::MessageBox::error( parent, mResult.first, mResult.second, this, caption ); } #include "qgpgmesignencryptjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h index e4b2a0be3..a48f32534 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -72,7 +72,7 @@ namespace Kleo { TQByteArray & cipherText ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; + void showErrorDialog( TQWidget * parent, const TQString & caption ) const; private slots: void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) { diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp index 4607f2c00..db5c225e8 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp @@ -108,9 +108,9 @@ void Kleo::QGpgMESignJob::doOperationDoneEvent( const GpgME::Error & ) { emit result( mResult, signature ); } -void Kleo::QGpgMESignJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::QGpgMESignJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( mResult.error() && !mResult.error().isCanceled() ) - Kleo::MessageBox::error( tqparent, mResult, this, caption ); + Kleo::MessageBox::error( parent, mResult, this, caption ); } #include "qgpgmesignjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h index 5c16137e7..2dd3230ac 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h @@ -68,7 +68,7 @@ namespace Kleo { TQByteArray & signature ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; + void showErrorDialog( TQWidget * parent, const TQString & caption ) const; private slots: void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) { diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp index f4db77ea3..b79e1772b 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.cpp +++ b/certmanager/lib/kleo/cryptobackendfactory.cpp @@ -174,8 +174,8 @@ const Kleo::CryptoBackend * Kleo::CryptoBackendFactory::backendByName( const TQS return 0; } -Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget * tqparent, const char * name ) const { - return new Kleo::BackendConfigWidget( mSelf, tqparent, name ); +Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget * parent, const char * name ) const { + return new Kleo::BackendConfigWidget( mSelf, parent, name ); } KConfig* Kleo::CryptoBackendFactory::configObject() const { diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h index 8f2990269..c6dd53f7d 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.h +++ b/certmanager/lib/kleo/cryptobackendfactory.h @@ -74,7 +74,7 @@ namespace Kleo { bool hasBackends() const; - Kleo::BackendConfigWidget * configWidget( TQWidget * tqparent=0, const char * name=0 ) const; + Kleo::BackendConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const; KConfig* configObject() const; diff --git a/certmanager/lib/kleo/decryptjob.h b/certmanager/lib/kleo/decryptjob.h index ee5802f88..72bf1b82e 100644 --- a/certmanager/lib/kleo/decryptjob.h +++ b/certmanager/lib/kleo/decryptjob.h @@ -63,7 +63,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - DecryptJob( TQObject * tqparent, const char * name ); + DecryptJob( TQObject * parent, const char * name ); public: ~DecryptJob(); diff --git a/certmanager/lib/kleo/decryptverifyjob.h b/certmanager/lib/kleo/decryptverifyjob.h index 0431279ae..e1cdce04b 100644 --- a/certmanager/lib/kleo/decryptverifyjob.h +++ b/certmanager/lib/kleo/decryptverifyjob.h @@ -66,7 +66,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - DecryptVerifyJob( TQObject * tqparent, const char * name ); + DecryptVerifyJob( TQObject * parent, const char * name ); public: ~DecryptVerifyJob(); diff --git a/certmanager/lib/kleo/deletejob.h b/certmanager/lib/kleo/deletejob.h index e6a3e2232..c48852f9d 100644 --- a/certmanager/lib/kleo/deletejob.h +++ b/certmanager/lib/kleo/deletejob.h @@ -59,7 +59,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - DeleteJob( TQObject * tqparent, const char * name ); + DeleteJob( TQObject * parent, const char * name ); public: ~DeleteJob(); diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index 7e39185c8..685d241bc 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -533,6 +533,6 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) { config.writeEntry( "AttributeOrder", order ); } -Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( TQWidget * tqparent, const char * name ) const { - return new DNAttributeOrderConfigWidget( mSelf, tqparent, name ); +Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( TQWidget * parent, const char * name ) const { + return new DNAttributeOrderConfigWidget( mSelf, parent, name ); } diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h index 0baf83ad6..3375e8f48 100644 --- a/certmanager/lib/kleo/dn.h +++ b/certmanager/lib/kleo/dn.h @@ -62,7 +62,7 @@ namespace Kleo { void setAttributeOrder( const TQStringList & order ); - DNAttributeOrderConfigWidget * configWidget( TQWidget * tqparent=0, const char * name=0 ) const; + DNAttributeOrderConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const; private: class Private; diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h index 1583c4866..f3d568ae0 100644 --- a/certmanager/lib/kleo/downloadjob.h +++ b/certmanager/lib/kleo/downloadjob.h @@ -62,7 +62,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - DownloadJob( TQObject * tqparent, const char * name ); + DownloadJob( TQObject * parent, const char * name ); public: ~DownloadJob(); diff --git a/certmanager/lib/kleo/encryptjob.h b/certmanager/lib/kleo/encryptjob.h index 640419346..c9e4d6764 100644 --- a/certmanager/lib/kleo/encryptjob.h +++ b/certmanager/lib/kleo/encryptjob.h @@ -65,7 +65,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - EncryptJob( TQObject * tqparent, const char * name ); + EncryptJob( TQObject * parent, const char * name ); public: ~EncryptJob(); diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h index 19472593e..0d693a6a9 100644 --- a/certmanager/lib/kleo/exportjob.h +++ b/certmanager/lib/kleo/exportjob.h @@ -62,7 +62,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - ExportJob( TQObject * tqparent, const char * name ); + ExportJob( TQObject * parent, const char * name ); public: ~ExportJob(); diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h index 4bd25b34b..c363276fd 100644 --- a/certmanager/lib/kleo/importjob.h +++ b/certmanager/lib/kleo/importjob.h @@ -63,7 +63,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - ImportJob( TQObject * tqparent, const char * name ); + ImportJob( TQObject * parent, const char * name ); public: ~ImportJob(); diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp index 709b68de1..907a74488 100644 --- a/certmanager/lib/kleo/job.cpp +++ b/certmanager/lib/kleo/job.cpp @@ -59,8 +59,8 @@ #include <gpg-error.h> -Kleo::Job::Job( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +Kleo::Job::Job( TQObject * parent, const char * name ) + : TQObject( parent, name ) { if ( tqApp ) connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) ); @@ -90,7 +90,7 @@ bool Kleo::Job::isAuditLogSupported() const { } #define make_job_subclass(x) \ - Kleo::x::x( TQObject * tqparent, const char * name ) : Job( tqparent, name ) {} \ + Kleo::x::x( TQObject * parent, const char * name ) : Job( parent, name ) {} \ Kleo::x::~x() {} make_job_subclass(KeyListJob) diff --git a/certmanager/lib/kleo/job.h b/certmanager/lib/kleo/job.h index 9dfaf822a..d4fe79b84 100644 --- a/certmanager/lib/kleo/job.h +++ b/certmanager/lib/kleo/job.h @@ -65,11 +65,11 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - Job( TQObject * tqparent, const char * name ); + Job( TQObject * parent, const char * name ); public: ~Job(); - virtual void showErrorDialog( TQWidget * tqparent=0, const TQString & caption=TQString() ) const; + virtual void showErrorDialog( TQWidget * parent=0, const TQString & caption=TQString() ) const; virtual TQString auditLogAsHtml() const; virtual GpgME::Error auditLogError() const; diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp index 049e3e6f2..6edc7c571 100644 --- a/certmanager/lib/kleo/keyfiltermanager.cpp +++ b/certmanager/lib/kleo/keyfiltermanager.cpp @@ -66,8 +66,8 @@ struct Kleo::KeyFilterManager::Private { Kleo::KeyFilterManager * Kleo::KeyFilterManager::mSelf = 0; -Kleo::KeyFilterManager::KeyFilterManager( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), d( 0 ) +Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name ) + : TQObject( parent, name ), d( 0 ) { mSelf = this; d = new Private(); diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h index b37a6e37b..6a6960d35 100644 --- a/certmanager/lib/kleo/keyfiltermanager.h +++ b/certmanager/lib/kleo/keyfiltermanager.h @@ -49,7 +49,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - KeyFilterManager( TQObject * tqparent=0, const char * name=0 ); + KeyFilterManager( TQObject * parent=0, const char * name=0 ); ~KeyFilterManager(); public: diff --git a/certmanager/lib/kleo/keygenerationjob.h b/certmanager/lib/kleo/keygenerationjob.h index d6478d094..058f4127a 100644 --- a/certmanager/lib/kleo/keygenerationjob.h +++ b/certmanager/lib/kleo/keygenerationjob.h @@ -62,7 +62,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - KeyGenerationJob( TQObject * tqparent, const char * name ); + KeyGenerationJob( TQObject * parent, const char * name ); public: ~KeyGenerationJob(); diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h index 2200dee30..8d9cb6a34 100644 --- a/certmanager/lib/kleo/keylistjob.h +++ b/certmanager/lib/kleo/keylistjob.h @@ -66,7 +66,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - KeyListJob( TQObject * tqparent, const char * name ); + KeyListJob( TQObject * parent, const char * name ); public: ~KeyListJob(); diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h index 8d790fb73..f5f7304bd 100644 --- a/certmanager/lib/kleo/refreshkeysjob.h +++ b/certmanager/lib/kleo/refreshkeysjob.h @@ -63,7 +63,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - RefreshKeysJob( TQObject * tqparent, const char * name ); + RefreshKeysJob( TQObject * parent, const char * name ); public: ~RefreshKeysJob(); diff --git a/certmanager/lib/kleo/signencryptjob.h b/certmanager/lib/kleo/signencryptjob.h index 117ac6227..976c5d5c8 100644 --- a/certmanager/lib/kleo/signencryptjob.h +++ b/certmanager/lib/kleo/signencryptjob.h @@ -68,7 +68,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - SignEncryptJob( TQObject * tqparent, const char * name ); + SignEncryptJob( TQObject * parent, const char * name ); public: ~SignEncryptJob(); diff --git a/certmanager/lib/kleo/signjob.h b/certmanager/lib/kleo/signjob.h index 7d90dc85b..f317fe582 100644 --- a/certmanager/lib/kleo/signjob.h +++ b/certmanager/lib/kleo/signjob.h @@ -66,7 +66,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - SignJob( TQObject * tqparent, const char * name ); + SignJob( TQObject * parent, const char * name ); public: ~SignJob(); diff --git a/certmanager/lib/kleo/specialjob.h b/certmanager/lib/kleo/specialjob.h index 797693914..d801bd4cc 100644 --- a/certmanager/lib/kleo/specialjob.h +++ b/certmanager/lib/kleo/specialjob.h @@ -66,7 +66,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - SpecialJob( TQObject * tqparent, const char * name ); + SpecialJob( TQObject * parent, const char * name ); public: ~SpecialJob(); diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h index 5c0a3c472..0bc801c7a 100644 --- a/certmanager/lib/kleo/verifydetachedjob.h +++ b/certmanager/lib/kleo/verifydetachedjob.h @@ -63,7 +63,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - VerifyDetachedJob( TQObject * tqparent, const char * name ); + VerifyDetachedJob( TQObject * parent, const char * name ); public: ~VerifyDetachedJob(); diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h index 942afac12..6092a32cb 100644 --- a/certmanager/lib/kleo/verifyopaquejob.h +++ b/certmanager/lib/kleo/verifyopaquejob.h @@ -63,7 +63,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - VerifyOpaqueJob( TQObject * tqparent, const char * name ); + VerifyOpaqueJob( TQObject * parent, const char * name ); public: ~VerifyOpaqueJob(); diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h index 9d2efd16b..bc589ec48 100644 --- a/certmanager/lib/tests/gnupgviewer.h +++ b/certmanager/lib/tests/gnupgviewer.h @@ -46,7 +46,7 @@ class GnuPGViewer : public TQTextEdit { Q_OBJECT TQ_OBJECT public: - GnuPGViewer( TQWidget * tqparent=0, const char * name=0 ); + GnuPGViewer( TQWidget * parent=0, const char * name=0 ); ~GnuPGViewer(); void setProcess( Kleo::GnuPGProcessBase * process ); diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index c3aba82d2..de3a4ff06 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -46,8 +46,8 @@ #include <tqstringlist.h> -GnuPGViewer::GnuPGViewer( TQWidget * tqparent, const char * name ) - : TQTextEdit( tqparent, name ), mProcess( 0 ) +GnuPGViewer::GnuPGViewer( TQWidget * parent, const char * name ) + : TQTextEdit( parent, name ), mProcess( 0 ) { setTextFormat( LogText ); setMaxLogLines( 10000 ); diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index b95ad74bd..8acef90f0 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -69,8 +69,8 @@ static const int numKeyParams = sizeof keyParams / sizeof *keyParams; static const char * protocol = 0; -KeyGenerator::KeyGenerator( TQWidget * tqparent, const char * name, WFlags ) - : KDialogBase( tqparent, name, true, "KeyGenerationJob test", +KeyGenerator::KeyGenerator( TQWidget * parent, const char * name, WFlags ) + : KDialogBase( parent, name, true, "KeyGenerationJob test", Close|User1, User1, true, KGuiItem( "Create" ) ) { TQWidget * w = new TQWidget( this ); diff --git a/certmanager/lib/tests/test_keygen.h b/certmanager/lib/tests/test_keygen.h index 44c075803..70ded0c7e 100644 --- a/certmanager/lib/tests/test_keygen.h +++ b/certmanager/lib/tests/test_keygen.h @@ -47,7 +47,7 @@ class KeyGenerator : public KDialogBase { Q_OBJECT TQ_OBJECT public: - KeyGenerator( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + KeyGenerator( TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~KeyGenerator(); public slots: diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index 6667b2e7c..ca31b39ab 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -91,8 +91,8 @@ namespace { } } -CertListView::CertListView( TQWidget * tqparent, const char * name, WFlags f ) - : Kleo::KeyListView( new TestColumnStrategy(), 0, tqparent, name, f ) +CertListView::CertListView( TQWidget * parent, const char * name, WFlags f ) + : Kleo::KeyListView( new TestColumnStrategy(), 0, parent, name, f ) { setHierarchical( true ); setRootIsDecorated( true ); diff --git a/certmanager/lib/tests/test_keylister.h b/certmanager/lib/tests/test_keylister.h index 6af935f92..f5b9bd897 100644 --- a/certmanager/lib/tests/test_keylister.h +++ b/certmanager/lib/tests/test_keylister.h @@ -43,7 +43,7 @@ class CertListView : public Kleo::KeyListView { Q_OBJECT TQ_OBJECT public: - CertListView( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + CertListView( TQWidget * parent=0, const char * name=0, WFlags f=0 ); public slots: void slotResult( const GpgME::KeyListResult & result ); diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp index a8d48a007..1c548c5b5 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp @@ -40,14 +40,14 @@ #include <klineedit.h> /* - * Constructs a AddDirectoryServiceDialogImpl which is a child of 'tqparent', with the + * Constructs a AddDirectoryServiceDialogImpl which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : AddDirectoryServiceDialog( tqparent, name, modal, fl ) +AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : AddDirectoryServiceDialog( parent, name, modal, fl ) { portED->setValidator( new TQIntValidator( 0, 65535, TQT_TQOBJECT(portED) ) ); } diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h index d6ad086d1..0b1a0ca6a 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h @@ -40,7 +40,7 @@ class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog TQ_OBJECT public: - AddDirectoryServiceDialogImpl( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddDirectoryServiceDialogImpl(); }; diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 7869b1d2b..1052cff52 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -76,8 +76,8 @@ namespace Kleo { class Kleo::BackendListView : public KListView { public: - BackendListView( BackendConfigWidget* tqparent, const char* name = 0 ) - : KListView( tqparent, name ) {} + BackendListView( BackendConfigWidget* parent, const char* name = 0 ) + : KListView( parent, name ) {} /// return backend for currently selected (/current) item. Used by Configure button. const Kleo::CryptoBackend* currentBackend() const; @@ -162,7 +162,7 @@ const Kleo::CryptoBackend* Kleo::BackendListView::currentBackend() const { if ( !curItem ) // can't happen return 0; if ( lvi_cast<Kleo::ProtocolCheckListItem>( curItem ) ) - curItem = curItem->tqparent(); + curItem = curItem->parent(); if ( const Kleo::BackendListViewItem * blvi = lvi_cast<Kleo::BackendListViewItem>( curItem ) ) return blvi->cryptoBackend(); return 0; @@ -175,9 +175,9 @@ const Kleo::CryptoBackend* Kleo::BackendListView::chosenBackend( const char * pr it.current() ; ++it ) if ( ProtocolCheckListItem * p = lvi_cast<ProtocolCheckListItem>( it.current() ) ) if ( p->isOn() && qstricmp( p->protocolName(), protocolName ) == 0 ) { - // OK that's the one. Now go up to the tqparent backend + // OK that's the one. Now go up to the parent backend // (need to do that in the listview since Protocol doesn't know it) - if ( const BackendListViewItem * parItem = lvi_cast<BackendListViewItem>( it.current()->tqparent() ) ) + if ( const BackendListViewItem * parItem = lvi_cast<BackendListViewItem>( it.current()->parent() ) ) return parItem->cryptoBackend(); } return 0; @@ -196,8 +196,8 @@ void Kleo::BackendListView::deselectAll( const char * protocolName, TQCheckListI //// -Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * tqparent, const char * name, WFlags f ) - : TQWidget( tqparent, name, f ), d( 0 ) +Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent, const char * name, WFlags f ) + : TQWidget( parent, name, f ), d( 0 ) { assert( factory ); d = new Private(); diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index 83b2eea0d..bdac0cf06 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -49,7 +49,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~BackendConfigWidget(); void load(); diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 169af00be..65edb93ef 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -34,11 +34,11 @@ #include <klocale.h> #include <kaccelmanager.h> -Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *tqparent, const char* name ) +Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name ) : KDialogBase( Swallow, // Remove the "whats's this" button since we have no support for it WStyle_Customize | WStyle_DialogBorder | WStyle_Maximize | WStyle_Title | WStyle_SysMenu, - tqparent, name, true /*modal*/, + parent, name, true /*modal*/, i18n( "Configure" ), Default|Cancel|Apply|Ok|User1, Ok, true /*separator*/, KGuiItem( i18n( "&Reset" ), "undo" ) ) { diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 05bb1c399..8a4c07e9f 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -48,7 +48,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *tqparent = 0, const char* name = 0 ); + CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent = 0, const char* name = 0 ); protected: virtual void slotOk(); diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index 9fa55e969..a16dcd22e 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -80,8 +80,8 @@ static const KJanusWidget::Face determineJanusFace( const Kleo::CryptoConfig * c : KJanusWidget::IconList ; } -Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * tqparent, const char * name ) - : KJanusWidget( tqparent, name, determineJanusFace( config ) ), mConfig( config ) +Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent, const char * name ) + : KJanusWidget( parent, name, determineJanusFace( config ) ), mConfig( config ) { TQWidget * vbox = 0; if ( face() == Plain ) { @@ -182,8 +182,8 @@ void Kleo::CryptoConfigModule::cancel() Kleo::CryptoConfigComponentGUI::CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ), + TQWidget* parent, const char* name ) + : TQWidget( parent, name ), mComponent( component ) { TQGridLayout * glay = new TQGridLayout( this, 1, 3, 0, KDialog::spacingHint() ); diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h index 46606c55e..b6f832b83 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.h +++ b/certmanager/lib/ui/cryptoconfigmodule.h @@ -49,7 +49,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * tqparent=0, const char * name=0 ); + CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent=0, const char * name=0 ); bool hasError() const; diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h index fb9acc6c5..65cae2499 100644 --- a/certmanager/lib/ui/cryptoconfigmodule_p.h +++ b/certmanager/lib/ui/cryptoconfigmodule_p.h @@ -62,7 +62,7 @@ namespace Kleo { public: CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); bool save(); void load(); @@ -82,7 +82,7 @@ namespace Kleo { public: CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group, - TQGridLayout * tqlayout, TQWidget* tqparent, const char* name = 0 ); + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); bool save(); void load(); @@ -155,7 +155,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -175,7 +175,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -195,7 +195,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -215,7 +215,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -235,7 +235,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private: @@ -255,7 +255,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private: @@ -274,7 +274,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private slots: diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp index 3dc3cd102..4975e3818 100644 --- a/certmanager/lib/ui/directoryserviceswidget.cpp +++ b/certmanager/lib/ui/directoryserviceswidget.cpp @@ -92,8 +92,8 @@ private: Kleo::DirectoryServicesWidget::DirectoryServicesWidget( Kleo::CryptoConfigEntry* configEntry, - TQWidget* tqparent, const char* name, WFlags fl ) - : DirectoryServicesWidgetBase( tqparent, name, fl ), + TQWidget* parent, const char* name, WFlags fl ) + : DirectoryServicesWidgetBase( parent, name, fl ), mConfigEntry( configEntry ) { x500LV->setSorting( -1 ); diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index 8a275f67a..bfefcec82 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -49,7 +49,7 @@ class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase public: DirectoryServicesWidget( Kleo::CryptoConfigEntry* configEntry, - TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~DirectoryServicesWidget(); void load(); diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 46adfe3b0..a4fc7d9a1 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -74,8 +74,8 @@ static void prepare( TQListView * lv ) { lv->addColumn( i18n("Description") ); } -Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * tqparent, const char * name, WFlags f ) - : TQWidget( tqparent, name, f ), d( 0 ) +Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent, const char * name, WFlags f ) + : TQWidget( parent, name, f ), d( 0 ) { assert( mapper ); d = new Private(); diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index a0867c4fa..b433c35ba 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -47,8 +47,8 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - /*! Use Kleo::DNAttributeMapper::instance()->configWidget( tqparent, name ) instead. */ - DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */ + DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~DNAttributeOrderConfigWidget(); void load(); diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index ee809df77..d736399f8 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -48,16 +48,16 @@ #include <tqfontmetrics.h> #include <tqapplication.h> -KDHorizontalLine::KDHorizontalLine( TQWidget * tqparent, const char * name, WFlags f ) - : TQFrame( tqparent, name, f ), +KDHorizontalLine::KDHorizontalLine( TQWidget * parent, const char * name, WFlags f ) + : TQFrame( parent, name, f ), mAlign( TQt::AlignAuto ), mLenVisible( 0 ) { TQFrame::setFrameStyle( HLine | Sunken ); } -KDHorizontalLine::KDHorizontalLine( const TQString & title, TQWidget * tqparent, const char * name, WFlags f ) - : TQFrame( tqparent, name, f ), +KDHorizontalLine::KDHorizontalLine( const TQString & title, TQWidget * parent, const char * name, WFlags f ) + : TQFrame( parent, name, f ), mAlign( TQt::AlignAuto ), mLenVisible( 0 ) { diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index fe286801e..466b54bca 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -49,8 +49,8 @@ class KDHorizontalLine : public TQFrame { TQ_OBJECT TQ_PROPERTY( TQString title READ title WRITE setTitle ) public: - KDHorizontalLine( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); - KDHorizontalLine( const TQString & title, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + KDHorizontalLine( TQWidget * parent=0, const char * name=0, WFlags f=0 ); + KDHorizontalLine( const TQString & title, TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~KDHorizontalLine(); TQString title() const { return mTitle; } diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index e81adc438..402235ddd 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -106,9 +106,9 @@ struct Kleo::KeyApprovalDialog::Private { Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients, const std::vector<GpgME::Key> & sender, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ), + : KDialogBase( parent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ), d( 0 ) { assert( !recipients.empty() ); diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index 993db1262..0452743b7 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -71,7 +71,7 @@ namespace Kleo { KeyApprovalDialog( const std::vector<Item> & recipients, const std::vector<GpgME::Key> & sender, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); ~KeyApprovalDialog(); diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index f1641339d..32d5be217 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -63,15 +63,15 @@ namespace { class ItemToolTip : public TQToolTip { public: - ItemToolTip( Kleo::KeyListView * tqparent ); + ItemToolTip( Kleo::KeyListView * parent ); protected: void maybeTip( const TQPoint & p ); private: Kleo::KeyListView * mKeyListView; }; - ItemToolTip::ItemToolTip( Kleo::KeyListView * tqparent ) - : TQToolTip( tqparent->viewport() ), mKeyListView( tqparent ) {} + ItemToolTip::ItemToolTip( Kleo::KeyListView * parent ) + : TQToolTip( parent->viewport() ), mKeyListView( parent ) {} void ItemToolTip::maybeTip( const TQPoint & p ) { if ( !mKeyListView ) @@ -135,8 +135,8 @@ static const struct { static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; -Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * tqparent, const char * name, WFlags f ) - : KListView( tqparent, name ), +Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * parent, const char * name, WFlags f ) + : KListView( parent, name ), mColumnStrategy( columnStrategy ), mDisplayStrategy ( displayStrategy ), mHierarchical( false ) @@ -276,9 +276,9 @@ void Kleo::KeyListView::doHierarchicalInsert( const GpgME::Key & key ) { return; KeyListViewItem * item = 0; if ( !key.isRoot() ) - if ( KeyListViewItem * tqparent = itemByFingerprint( key.chainID() ) ) { - item = new KeyListViewItem( tqparent, key ); - tqparent->setOpen( true ); + if ( KeyListViewItem * parent = itemByFingerprint( key.chainID() ) ) { + item = new KeyListViewItem( parent, key ); + parent->setOpen( true ); } if ( !item ) item = new KeyListViewItem( this, key ); // top-level (for now) @@ -293,12 +293,12 @@ void Kleo::KeyListView::gatherScattered() { item = item->nextSibling(); if ( cur->key().isRoot() ) continue; - if ( KeyListViewItem * tqparent = itemByFingerprint( cur->key().chainID() ) ) { - // found a new tqparent... + if ( KeyListViewItem * parent = itemByFingerprint( cur->key().chainID() ) ) { + // found a new parent... // ### todo: optimize by suppressing removing/adding the item to the itemMap... takeItem( cur ); - tqparent->insertItem( cur ); - tqparent->setOpen( true ); + parent->insertItem( cur ); + parent->setOpen( true ); } } } @@ -313,8 +313,8 @@ void Kleo::KeyListView::scatterGathered( TQListViewItem * start ) { assert( cur->childCount() == 0 ); // ### todo: optimize by suppressing removing/adding the item to the itemMap... - if ( cur->tqparent() ) - cur->tqparent()->takeItem( cur ); + if ( cur->parent() ) + cur->parent()->takeItem( cur ); else takeItem( cur ); insertItem( cur ); @@ -370,26 +370,26 @@ void Kleo::KeyListView::slotEmitContextMenu( KListView*, TQListViewItem * item, // // -Kleo::KeyListViewItem::KeyListViewItem( KeyListView * tqparent, const GpgME::Key & key ) - : TQListViewItem( tqparent ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListView * parent, const GpgME::Key & key ) + : TQListViewItem( parent ) { setKey( key ); } -Kleo::KeyListViewItem::KeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Key & key ) - : TQListViewItem( tqparent, after ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ) + : TQListViewItem( parent, after ) { setKey( key ); } -Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * tqparent, const GpgME::Key & key ) - : TQListViewItem( tqparent ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, const GpgME::Key & key ) + : TQListViewItem( parent ) { setKey( key ); } -Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Key & key ) - : TQListViewItem( tqparent, after ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Key & key ) + : TQListViewItem( parent, after ) { setKey( key ); } @@ -402,7 +402,7 @@ Kleo::KeyListViewItem::~KeyListViewItem() { while ( TQListViewItem * item = firstChild() ) delete item; // better do this here, too, since deletion is top-down and thus - // we're deleted when our tqparent item is no longer a + // we're deleted when our parent item is no longer a // KeyListViewItem, but a mere TQListViewItem, so our takeItem() // overload is gone by that time... if ( KeyListView * lv = listView() ) @@ -483,33 +483,33 @@ void Kleo::KeyListViewItem::takeItem( TQListViewItem * qlvi ) { // // -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * tqparent, const GpgME::Subkey & subkey ) - : KeyListViewItem( tqparent, subkey.tqparent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey ) + : KeyListViewItem( parent, subkey.parent() ), mSubkey( subkey ) { } -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ) - : KeyListViewItem( tqparent, after, subkey.tqparent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ) + : KeyListViewItem( parent, after, subkey.parent() ), mSubkey( subkey ) { } -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * tqparent, const GpgME::Subkey & subkey ) - : KeyListViewItem( tqparent, subkey.tqparent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * parent, const GpgME::Subkey & subkey ) + : KeyListViewItem( parent, subkey.parent() ), mSubkey( subkey ) { } -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ) - : KeyListViewItem( tqparent, after, subkey.tqparent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ) + : KeyListViewItem( parent, after, subkey.parent() ), mSubkey( subkey ) { } void Kleo::SubkeyKeyListViewItem::setSubkey( const GpgME::Subkey & subkey ) { mSubkey = subkey; - setKey( subkey.tqparent() ); + setKey( subkey.parent() ); } TQString Kleo::SubkeyKeyListViewItem::text( int col ) const { @@ -561,33 +561,33 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & // // -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * tqparent, const GpgME::UserID & userID ) - : KeyListViewItem( tqparent, userID.tqparent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userID ) + : KeyListViewItem( parent, userID.parent() ), mUserID( userID ) { } -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID & userID ) - : KeyListViewItem( tqparent, after, userID.tqparent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userID ) + : KeyListViewItem( parent, after, userID.parent() ), mUserID( userID ) { } -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID & userID ) - : KeyListViewItem( tqparent, userID.tqparent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID & userID ) + : KeyListViewItem( parent, userID.parent() ), mUserID( userID ) { } -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID & userID ) - : KeyListViewItem( tqparent, after, userID.tqparent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID & userID ) + : KeyListViewItem( parent, after, userID.parent() ), mUserID( userID ) { } void Kleo::UserIDKeyListViewItem::setUserID( const GpgME::UserID & userID ) { mUserID = userID; - setKey( userID.tqparent() ); + setKey( userID.parent() ); } TQString Kleo::UserIDKeyListViewItem::text( int col ) const { @@ -640,33 +640,33 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & // // -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * tqparent, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( tqparent, signature.tqparent().tqparent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( parent, signature.parent().parent() ), mSignature( signature ) { } -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( tqparent, after, signature.tqparent().tqparent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( parent, after, signature.parent().parent() ), mSignature( signature ) { } -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( tqparent, signature.tqparent().tqparent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( parent, signature.parent().parent() ), mSignature( signature ) { } -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( tqparent, after, signature.tqparent().tqparent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( parent, after, signature.parent().parent() ), mSignature( signature ) { } void Kleo::SignatureKeyListViewItem::setSignature( const GpgME::UserID::Signature & signature ) { mSignature = signature; - setKey( signature.tqparent().tqparent() ); + setKey( signature.parent().parent() ); } TQString Kleo::SignatureKeyListViewItem::text( int col ) const { diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 6161bfe8d..d59211313 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -64,10 +64,10 @@ namespace Kleo { class KDE_EXPORT KeyListViewItem : public TQListViewItem { public: - KeyListViewItem( KeyListView * tqparent, const GpgME::Key & key ); - KeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Key & key ); - KeyListViewItem( KeyListViewItem * tqparent, const GpgME::Key & key ); - KeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Key & key ); + KeyListViewItem( KeyListView * parent, const GpgME::Key & key ); + KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ); + KeyListViewItem( KeyListViewItem * parent, const GpgME::Key & key ); + KeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Key & key ); ~KeyListViewItem(); void setKey( const GpgME::Key & key ); @@ -103,10 +103,10 @@ namespace Kleo { class KDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { public: - SubkeyKeyListViewItem( KeyListView * tqparent, const GpgME::Subkey & subkey ); - SubkeyKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ); - SubkeyKeyListViewItem( KeyListViewItem * tqparent, const GpgME::Subkey & subkey ); - SubkeyKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListViewItem * parent, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ); void setSubkey( const GpgME::Subkey & subkey ); const GpgME::Subkey & subkey() const { return mSubkey; } @@ -135,10 +135,10 @@ namespace Kleo { class KDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { public: - UserIDKeyListViewItem( KeyListView * tqparent, const GpgME::UserID & userid ); - UserIDKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID & userid ); - UserIDKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID & userid ); - UserIDKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID & userid ); void setUserID( const GpgME::UserID & userid ); const GpgME::UserID userID() const { return mUserID; } @@ -167,10 +167,10 @@ namespace Kleo { class KDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { public: - SignatureKeyListViewItem( KeyListView * tqparent, const GpgME::UserID::Signature & sig ); - SignatureKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); - SignatureKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID::Signature & sig ); - SignatureKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); void setSignature( const GpgME::UserID::Signature & sig ); const GpgME::UserID::Signature & signature() const { return mSignature; } @@ -254,7 +254,7 @@ namespace Kleo { KeyListView( const ColumnStrategy * strategy, const DisplayStrategy * display=0, - TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~KeyListView(); diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index 16efbd46f..01e6902f5 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -82,8 +82,8 @@ #include <assert.h> Kleo::KeyRequester::KeyRequester( unsigned int allowedKeys, bool multipleKeys, - TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ), + TQWidget * parent, const char * name ) + : TQWidget( parent, name ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mMulti( multipleKeys ), @@ -94,8 +94,8 @@ Kleo::KeyRequester::KeyRequester( unsigned int allowedKeys, bool multipleKeys, init(); } -Kleo::KeyRequester::KeyRequester( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ), +Kleo::KeyRequester::KeyRequester( TQWidget * parent, const char * name ) + : TQWidget( parent, name ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mMulti( false ), @@ -226,14 +226,14 @@ void Kleo::KeyRequester::updateKeys() { #ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ #define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ -static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) { +static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { assert( err ); const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) .tqarg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) ); + KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } #endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ @@ -430,15 +430,15 @@ static inline unsigned int signingKeyUsage( bool openpgp, bool smime, bool trust } Kleo::EncryptionKeyRequester::EncryptionKeyRequester( bool multi, unsigned int proto, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool onlyTrusted, bool onlyValid ) : KeyRequester( encryptionKeyUsage( proto & OpenPGP, proto & SMIME, onlyTrusted, onlyValid ), multi, - tqparent, name ) + parent, name ) { } -Kleo::EncryptionKeyRequester::EncryptionKeyRequester( TQWidget * tqparent, const char * name ) - : KeyRequester( 0, false, tqparent, name ) +Kleo::EncryptionKeyRequester::EncryptionKeyRequester( TQWidget * parent, const char * name ) + : KeyRequester( 0, false, parent, name ) { } @@ -451,15 +451,15 @@ void Kleo::EncryptionKeyRequester::setAllowedKeys( unsigned int proto, bool only } Kleo::SigningKeyRequester::SigningKeyRequester( bool multi, unsigned int proto, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool onlyTrusted, bool onlyValid ) : KeyRequester( signingKeyUsage( proto & OpenPGP, proto & SMIME, onlyTrusted, onlyValid ), multi, - tqparent, name ) + parent, name ) { } -Kleo::SigningKeyRequester::SigningKeyRequester( TQWidget * tqparent, const char * name ) - : KeyRequester( 0, false, tqparent, name ) +Kleo::SigningKeyRequester::SigningKeyRequester( TQWidget * parent, const char * name ) + : KeyRequester( 0, false, parent, name ) { } diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 5c7913ddb..68bdd7038 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -78,9 +78,9 @@ namespace Kleo { TQ_OBJECT public: KeyRequester( unsigned int allowedKeys, bool multipleKeys=false, - TQWidget * tqparent=0, const char * name=0 ); + TQWidget * parent=0, const char * name=0 ); // Constructor for TQt Designer - KeyRequester( TQWidget * tqparent=0, const char * name=0 ); + KeyRequester( TQWidget * parent=0, const char * name=0 ); ~KeyRequester(); const GpgME::Key & key() const; @@ -169,12 +169,12 @@ namespace Kleo { * Preferred constructor */ EncryptionKeyRequester( bool multipleKeys=false, unsigned int proto=AllProtocols, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool onlyTrusted=true, bool onlyValid=true ); /** * Constructor for TQt designer */ - EncryptionKeyRequester( TQWidget * tqparent=0, const char * name=0 ); + EncryptionKeyRequester( TQWidget * parent=0, const char * name=0 ); ~EncryptionKeyRequester(); void setAllowedKeys( unsigned int proto, bool onlyTrusted=true, bool onlyValid=true ); @@ -202,12 +202,12 @@ namespace Kleo { * @param onlyValid only show valid keys */ SigningKeyRequester( bool multipleKeys=false, unsigned int proto=AllProtocols, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool onlyTrusted=true, bool onlyValid=true ); /** * Constructor for TQt designer */ - SigningKeyRequester( TQWidget * tqparent=0, const char * name=0 ); + SigningKeyRequester( TQWidget * parent=0, const char * name=0 ); ~SigningKeyRequester(); /* diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 141e9e989..29d24e151 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -301,9 +301,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ), + : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mRememberCB( 0 ), @@ -321,9 +321,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ), + : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mRememberCB( 0 ), @@ -342,9 +342,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ), + : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mRememberCB( 0 ), @@ -562,14 +562,14 @@ void Kleo::KeySelectionDialog::slotStartCertificateManager( const TQString &quer #ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ #define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ -static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) { +static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { assert( err ); const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) .tqarg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) ); + KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } #endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index c0bfa7eef..44634a396 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -90,7 +90,7 @@ namespace Kleo { unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); KeySelectionDialog( const TQString & title, const TQString & text, @@ -99,7 +99,7 @@ namespace Kleo { unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); KeySelectionDialog( const TQString & title, const TQString & text, @@ -107,7 +107,7 @@ namespace Kleo { unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); ~KeySelectionDialog(); diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 0cef145b2..2dfe083d5 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -77,8 +77,8 @@ class AuditLogViewer : public KDialogBase { // Q_OBJECT TQ_OBJECT public: - explicit AuditLogViewer( const TQString & log, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ) - : KDialogBase( tqparent, name, false, i18n("View GnuPG Audit Log"), + explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 ) + : KDialogBase( parent, name, false, i18n("View GnuPG Audit Log"), Close|User1|User2, Close, false, KGuiItem_save(), KGuiItem_copy() ), m_log( /* sic */ ), m_textEdit( new TQTextEdit( this, "m_textEdit" ) ) @@ -144,13 +144,13 @@ private: } // anon namespace // static -void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString & caption ) { +void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & caption ) { if ( !job ) return; if ( !GpgME::hasFeature( AuditLogFeature ) || !job->isAuditLogSupported() ) { - KMessageBox::information( tqparent, i18n("Your system does not have support for GnuPG Audit Logs"), + KMessageBox::information( parent, i18n("Your system does not have support for GnuPG Audit Logs"), i18n("System Error") ); return; } @@ -158,7 +158,7 @@ void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString const GpgME::Error err = job->auditLogError(); if ( err.code() != GPG_ERR_NO_DATA ) { - KMessageBox::information( tqparent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1") + KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1") .tqarg( TQString::fromLocal8Bit( err.asString() ) ), i18n("GnuPG Audit Log Error") ); return; @@ -167,29 +167,29 @@ void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString const TQString log = job->auditLogAsHtml(); if ( log.isEmpty() ) { - KMessageBox::information( tqparent, i18n("No GnuPG Audit Log available for this operation."), + KMessageBox::information( parent, i18n("No GnuPG Audit Log available for this operation."), i18n("No GnuPG Audit Log") ); return; } - auditLog( tqparent, log, caption ); + auditLog( parent, log, caption ); } // static -void MessageBox::auditLog( TQWidget * tqparent, const TQString & log, const TQString & caption ) { - AuditLogViewer * const alv = new AuditLogViewer( log, tqparent, "alv", TQt::WDestructiveClose ); +void MessageBox::auditLog( TQWidget * parent, const TQString & log, const TQString & caption ) { + AuditLogViewer * const alv = new AuditLogViewer( log, parent, "alv", TQt::WDestructiveClose ); alv->setCaption( caption ); alv->show(); } // static -void MessageBox::auditLog( TQWidget * tqparent, const Job * job ) { - auditLog( tqparent, job, i18n("GnuPG Audit Log Viewer") ); +void MessageBox::auditLog( TQWidget * parent, const Job * job ) { + auditLog( parent, job, i18n("GnuPG Audit Log Viewer") ); } // static -void MessageBox::auditLog( TQWidget * tqparent, const TQString & log ) { - auditLog( tqparent, log, i18n("GnuPG Audit Log Viewer") ); +void MessageBox::auditLog( TQWidget * parent, const TQString & log ) { + auditLog( parent, log, i18n("GnuPG Audit Log Viewer") ); } static TQString to_information_string( const SigningResult & result ) { @@ -221,63 +221,63 @@ static TQString to_error_string( const SigningResult & sresult, const Encryption } // static -void MessageBox::information( TQWidget * tqparent, const SigningResult & result, const Job * job, int options ) { - information( tqparent, result, job, i18n("Signing Result"), options ); +void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, int options ) { + information( parent, result, job, i18n("Signing Result"), options ); } // static -void MessageBox::information( TQWidget * tqparent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); +void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); } // static -void MessageBox::error( TQWidget * tqparent, const SigningResult & result, const Job * job, int options ) { - error( tqparent, result, job, i18n("Signing Error"), options ); +void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, int options ) { + error( parent, result, job, i18n("Signing Error"), options ); } // static -void MessageBox::error( TQWidget * tqparent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); +void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); } // static -void MessageBox::information( TQWidget * tqparent, const EncryptionResult & result, const Job * job, int options ) { - information( tqparent, result, job, i18n("Encryption Result"), options ); +void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) { + information( parent, result, job, i18n("Encryption Result"), options ); } // static -void MessageBox::information( TQWidget * tqparent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); +void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); } // static -void MessageBox::error( TQWidget * tqparent, const EncryptionResult & result, const Job * job, int options ) { - error( tqparent, result, job, i18n("Encryption Error"), options ); +void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) { + error( parent, result, job, i18n("Encryption Error"), options ); } // static -void MessageBox::error( TQWidget * tqparent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); +void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); } // static -void MessageBox::information( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { - information( tqparent, sresult, eresult, job, i18n("Encryption Result"), options ); +void MessageBox::information( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { + information( parent, sresult, eresult, job, i18n("Encryption Result"), options ); } // static -void MessageBox::information( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options ); +void MessageBox::information( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options ); } // static -void MessageBox::error( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { - error( tqparent, sresult, eresult, job, i18n("Encryption Error"), options ); +void MessageBox::error( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { + error( parent, sresult, eresult, job, i18n("Encryption Error"), options ); } // static -void MessageBox::error( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options ); +void MessageBox::error( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options ); } // static @@ -307,15 +307,15 @@ bool MessageBox::showAuditLogButton( const Kleo::Job * job ) { // static -void MessageBox::make( TQWidget * tqparent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) { +void MessageBox::make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) { KDialogBase * dialog = showAuditLogButton( job ) ? new KDialogBase( caption, KDialogBase::Yes | KDialogBase::No, KDialogBase::Yes, KDialogBase::Yes, - tqparent, "error", true, true, + parent, "error", true, true, KStdGuiItem::ok(), KGuiItem_showAuditLog() ) : new KDialogBase( caption, KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes, - tqparent, "error", true, true, + parent, "error", true, true, KStdGuiItem::ok() ) ; if ( options & KMessageBox::PlainCaption ) dialog->setPlainCaption( caption ); diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h index 64cd1a2ed..69dea34c5 100644 --- a/certmanager/lib/ui/messagebox.h +++ b/certmanager/lib/ui/messagebox.h @@ -54,30 +54,30 @@ namespace Kleo { class MessageBox { public: - static void information( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void information( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void information( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void information( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void information( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void information( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void auditLog( TQWidget * tqparent, const Kleo::Job * job, const TQString & caption ); - static void auditLog( TQWidget * tqparent, const Kleo::Job * job ); - static void auditLog( TQWidget * tqparent, const TQString & log, const TQString & caption ); - static void auditLog( TQWidget * tqparent, const TQString & log ); + static void information( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void information( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + + static void information( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void information( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + + static void information( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void information( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); + + static void auditLog( TQWidget * parent, const Kleo::Job * job, const TQString & caption ); + static void auditLog( TQWidget * parent, const Kleo::Job * job ); + static void auditLog( TQWidget * parent, const TQString & log, const TQString & caption ); + static void auditLog( TQWidget * parent, const TQString & log ); static bool showAuditLogButton( const Kleo::Job * job ); private: - static void make( TQWidget * tqparent, TQMessageBox::Icon icon, const TQString & text, const Kleo::Job * job, const TQString & caption, int options ); + static void make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Kleo::Job * job, const TQString & caption, int options ); }; diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index 91ecdef6f..d88278878 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -66,8 +66,8 @@ struct Kleo::PassphraseDialog::Private { Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString & caption, - TQWidget * tqparent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok ), d( 0 ) + TQWidget * parent, const char * name, bool modal ) + : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok ), d( 0 ) { d = new Private(); diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h index 6ff4289c4..15e6c132e 100644 --- a/certmanager/lib/ui/passphrasedialog.h +++ b/certmanager/lib/ui/passphrasedialog.h @@ -59,7 +59,7 @@ namespace Kleo { public: PassphraseDialog( const TQString & description, const TQString & caption=TQString(), - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); ~PassphraseDialog(); diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp index b6518c60e..6fe2f5311 100644 --- a/certmanager/lib/ui/progressbar.cpp +++ b/certmanager/lib/ui/progressbar.cpp @@ -39,8 +39,8 @@ static const int busyTimerTickInterval = 100; static const int busyTimerTickIncrement = 5; -Kleo::ProgressBar::ProgressBar( TQWidget * tqparent, const char * name, WFlags f ) - : TQProgressBar( 0, tqparent, name, f ), +Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f ) + : TQProgressBar( 0, parent, name, f ), mRealProgress( -1 ) { mBusyTimer = new TQTimer( this ); diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index 705fe11f1..f5a9644fe 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -46,7 +46,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - ProgressBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 ); public slots: void slotProgress( const TQString & message, int type, int current, int total ); diff --git a/indexlib/manager.h b/indexlib/manager.h index 6224a9db4..3dc1bdef6 100644 --- a/indexlib/manager.h +++ b/indexlib/manager.h @@ -56,12 +56,12 @@ class memory_manager { virtual void resize( unsigned ) = 0; }; -template <memory_manager* ( *get_tqparent )()> +template <memory_manager* ( *get_parent )()> struct thing_manager { public: - const unsigned char* ronly_base( unsigned idx ) const { return get_tqparent()->ronly_base( idx ); } - unsigned char* rw_base( unsigned idx ) const { return get_tqparent()->rw_base( idx ); } + const unsigned char* ronly_base( unsigned idx ) const { return get_parent()->ronly_base( idx ); } + unsigned char* rw_base( unsigned idx ) const { return get_parent()->rw_base( idx ); } }; diff --git a/indexlib/mempool.h b/indexlib/mempool.h index fca5596d5..acf624948 100644 --- a/indexlib/mempool.h +++ b/indexlib/mempool.h @@ -127,7 +127,7 @@ struct mempool /* : boost::noncopyable */ { }; START_THING( list_node, thing<list_node_manager> ) - void set_tqparent( const mempool* p ) { this->parent_ = p; } + void set_parent( const mempool* p ) { this->parent_ = p; } MEMBER( uint16_t, order, 0 ) MEMBER( uint32_t, next, 2 ) MEMBER( uint32_t, prev, 6 ) diff --git a/indexlib/mempool.tcc b/indexlib/mempool.tcc index fcb65942c..19a5e6d44 100644 --- a/indexlib/mempool.tcc +++ b/indexlib/mempool.tcc @@ -142,7 +142,7 @@ template <typename Traits> typename mempool<Traits>::list_nodeptr mempool<Traits>::get_node( uint32_t p ) const { assert( p ); list_nodeptr res = list_nodeptr::cast_from_uint32( p + Traits::type_offset() ); - res->set_tqparent( this ); + res->set_parent( this ); return res; } diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h index 421c0d332..445b5945c 100644 --- a/kabc/frontend/mainWindow.ui.h +++ b/kabc/frontend/mainWindow.ui.h @@ -20,8 +20,8 @@ using namespace KABC; class AddresseeItem : public TQListViewItem { public: - AddresseeItem( TQListView *tqparent, const Addressee &a ) : - TQListViewItem( tqparent, a.realName(), a.uid() ), mAddressee( a ) {} + AddresseeItem( TQListView *parent, const Addressee &a ) : + TQListViewItem( parent, a.realName(), a.uid() ), mAddressee( a ) {} void setAddressee( const Addressee &a ) { mAddressee = a; } Addressee &addressee() { return mAddressee; } diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp index c12967862..96cf79232 100644 --- a/kabc/kabc2mutt/kabc2mutt.cpp +++ b/kabc/kabc2mutt/kabc2mutt.cpp @@ -29,8 +29,8 @@ static std::ostream & operator<< ( std::ostream &os, const TQString &s ); -KABC2Mutt::KABC2Mutt( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), mFormat( Aliases ), +KABC2Mutt::KABC2Mutt( TQObject *parent, const char *name ) + : TQObject( parent, name ), mFormat( Aliases ), mIgnoreCase( false ), mAllAddresses( false ), mAlternateKeyFormat( false ), mAddressBook( 0 ) diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h index 855b48dbd..6b41fe24f 100644 --- a/kabc/kabc2mutt/kabc2mutt.h +++ b/kabc/kabc2mutt/kabc2mutt.h @@ -31,7 +31,7 @@ class KABC2Mutt : public TQObject enum Format { Aliases, Query }; - KABC2Mutt( TQObject *tqparent, const char *name = 0 ); + KABC2Mutt( TQObject *parent, const char *name = 0 ); void setQuery( const TQString &query ) { mQuery = query; } void setFormat( Format format ) { mFormat = format; } diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 61b8ec90b..a23c4436b 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -57,8 +57,8 @@ class TabPressEater : public TQObject { public: - TabPressEater( TQObject *tqparent ) - : TQObject( tqparent, "TabPressEater" ) + TabPressEater( TQObject *parent ) + : TQObject( parent, "TabPressEater" ) { } @@ -68,7 +68,7 @@ class TabPressEater : public TQObject if ( event->type() == TQEvent::KeyPress ) { TQKeyEvent *keyEvent = (TQKeyEvent*)event; if ( keyEvent->key() == TQt::Key_Tab ) { - TQApplication::sendEvent( tqparent(), event ); + TQApplication::sendEvent( parent(), event ); return true; } else return false; @@ -79,8 +79,8 @@ class TabPressEater : public TQObject }; -AddressEditWidget::AddressEditWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 ); tqlayout->setSpacing( KDialog::spacingHint() ); @@ -257,10 +257,10 @@ void AddressEditWidget::updateAddressEdit() } AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, - int selected, TQWidget *tqparent, + int selected, TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "street/postal", "Edit Address" ), Ok | Cancel, Ok, - tqparent, name, true, true ), + parent, name, true, true ), mPreviousAddress( 0 ) { mAddressList = list; @@ -599,9 +599,9 @@ void AddressEditDialog::fillCountryCombo() } -AddressTypeDialog::AddressTypeDialog( int type, TQWidget *tqparent ) +AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent ) : KDialogBase( Plain, i18n( "street/postal", "Edit Address Type" ), Ok | Cancel, Ok, - tqparent, "AddressTypeDialog" ) + parent, "AddressTypeDialog" ) { TQWidget *page = plainPage(); TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h index 40465d373..b68583f0a 100644 --- a/kaddressbook/addresseditwidget.h +++ b/kaddressbook/addresseditwidget.h @@ -55,7 +55,7 @@ class AddressEditWidget : public TQWidget TQ_OBJECT public: - AddressEditWidget( TQWidget *tqparent, const char *name = 0 ); + AddressEditWidget( TQWidget *parent, const char *name = 0 ); ~AddressEditWidget(); KABC::Address::List addresses(); @@ -97,7 +97,7 @@ class AddressEditDialog : public KDialogBase public: AddressEditDialog( const KABC::Address::List &list, int selected, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); ~AddressEditDialog(); KABC::Address::List addresses(); @@ -142,7 +142,7 @@ class AddressEditDialog : public KDialogBase class AddressTypeDialog : public KDialogBase { public: - AddressTypeDialog( int type, TQWidget *tqparent ); + AddressTypeDialog( int type, TQWidget *parent ); ~AddressTypeDialog(); int type() const; diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h index 3dc670b4f..3dc9749f7 100644 --- a/kaddressbook/addresseeeditorbase.h +++ b/kaddressbook/addresseeeditorbase.h @@ -34,8 +34,8 @@ class AddresseeEditorBase : public TQWidget TQ_OBJECT public: - AddresseeEditorBase( TQWidget *tqparent, const char *name = 0 ) - : TQWidget( tqparent, name ) + AddresseeEditorBase( TQWidget *parent, const char *name = 0 ) + : TQWidget( parent, name ) { } diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index 7b1276c83..a742c3f76 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -35,10 +35,10 @@ #include "addresseeeditordialog.h" AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply, - KDialogBase::Ok, tqparent, name, false ) + KDialogBase::Ok, parent, name, false ) { // Set this to be the group leader for all subdialogs - this means // modal subdialogs will only affect this dialog, not the other windows diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h index 7d0258e97..eedb3ae4f 100644 --- a/kaddressbook/addresseeeditordialog.h +++ b/kaddressbook/addresseeeditordialog.h @@ -39,7 +39,7 @@ class AddresseeEditorDialog : public KDialogBase public: AddresseeEditorDialog( KAB::Core *core, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); ~AddresseeEditorDialog(); void setAddressee( const KABC::Addressee& ); diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index 61ba5c18e..72e119d9a 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -33,8 +33,8 @@ #include "addresseeeditorextension.h" -AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *tqparent, const char *name ) - : KAB::ExtensionWidget( core, tqparent, name ) +AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name ) + : KAB::ExtensionWidget( core, parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); diff --git a/kaddressbook/addresseeeditorextension.h b/kaddressbook/addresseeeditorextension.h index 0c1a735b0..b54ef86a2 100644 --- a/kaddressbook/addresseeeditorextension.h +++ b/kaddressbook/addresseeeditorextension.h @@ -33,7 +33,7 @@ class AddresseeEditorExtension : public KAB::ExtensionWidget TQ_OBJECT public: - AddresseeEditorExtension( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ); + AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name = 0 ); ~AddresseeEditorExtension(); /** diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index da551648d..6892f909b 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -67,8 +67,8 @@ #include "addresseeeditorwidget.h" -AddresseeEditorWidget::AddresseeEditorWidget( TQWidget *tqparent, const char *name ) - : AddresseeEditorBase( tqparent, name ), +AddresseeEditorWidget::AddresseeEditorWidget( TQWidget *parent, const char *name ) + : AddresseeEditorBase( parent, name ), mBlockSignals( false ), mReadOnly( false ) { kdDebug(5720) << "AddresseeEditorWidget()" << endl; diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h index 3e04dcd7b..56a98adb5 100644 --- a/kaddressbook/addresseeeditorwidget.h +++ b/kaddressbook/addresseeeditorwidget.h @@ -69,7 +69,7 @@ class AddresseeEditorWidget : public AddresseeEditorBase TQ_OBJECT public: - AddresseeEditorWidget( TQWidget *tqparent, const char *name = 0 ); + AddresseeEditorWidget( TQWidget *parent, const char *name = 0 ); ~AddresseeEditorWidget(); void setAddressee( const KABC::Addressee& ); diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index 15bfe7a00..d63a33fab 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -34,10 +34,10 @@ #include "addviewdialog.h" AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n( "Add View" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, - tqparent, name ), + parent, name ), mViewFactoryDict( viewFactoryDict ) { mTypeId = 0; diff --git a/kaddressbook/addviewdialog.h b/kaddressbook/addviewdialog.h index 6e1fcd446..27a91682b 100644 --- a/kaddressbook/addviewdialog.h +++ b/kaddressbook/addviewdialog.h @@ -44,7 +44,7 @@ class AddViewDialog : public KDialogBase TQ_OBJECT public: - AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *tqparent, + AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *parent, const char *name = 0 ); ~AddViewDialog(); diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index 3606fdac3..ee3c179f1 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -85,8 +85,8 @@ class KABCStorage : public KPIM::DesignerFields::Storage AdvancedCustomFields::AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab, - TQWidget *tqparent, const char *name ) - : KAB::ContactEditorWidget( ab, tqparent, name ) + TQWidget *parent, const char *name ) + : KAB::ContactEditorWidget( ab, parent, name ) { initGUI( uiFile ); } diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h index fd00b58e1..ea184f9b8 100644 --- a/kaddressbook/advancedcustomfields.h +++ b/kaddressbook/advancedcustomfields.h @@ -43,7 +43,7 @@ class AdvancedCustomFields : public KAB::ContactEditorWidget public: AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); void loadContact( KABC::Addressee *addr ); void storeContact( KABC::Addressee *addr ); diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index e0afc9d6a..1e3677c55 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -107,8 +107,8 @@ void ContactEditorWidgetManager::reload() /////////////////////////////////////////////////////////////////////////////// -ContactEditorTabPage::ContactEditorTabPage( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +ContactEditorTabPage::ContactEditorTabPage( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { mLayout = new TQGridLayout( this, 0, 2, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h index ae9c69b93..5c7ff9fb1 100644 --- a/kaddressbook/contacteditorwidgetmanager.h +++ b/kaddressbook/contacteditorwidgetmanager.h @@ -70,7 +70,7 @@ class ContactEditorTabPage : public TQWidget TQ_OBJECT public: - ContactEditorTabPage( TQWidget *tqparent, const char *name = 0 ); + ContactEditorTabPage( TQWidget *parent, const char *name = 0 ); /** Adds a widget to the tab. diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index d78c48c61..1466e9900 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -42,9 +42,9 @@ #include "customfieldswidget.h" -AddFieldDialog::AddFieldDialog( TQWidget *tqparent, const char *name ) +AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Add Field" ), Ok | Cancel, - Ok, tqparent, name, true, true ) + Ok, parent, name, true, true ) { TQWidget *page = plainPage(); @@ -121,8 +121,8 @@ void AddFieldDialog::nameChanged( const TQString &name ) enableButton( Ok, !name.isEmpty() ); } -FieldWidget::FieldWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +FieldWidget::FieldWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -377,8 +377,8 @@ void FieldWidget::recalculateLayout() } CustomFieldsWidget::CustomFieldsWidget( KABC::AddressBook *ab, - TQWidget *tqparent, const char *name ) - : KAB::ContactEditorWidget( ab, tqparent, name ) + TQWidget *parent, const char *name ) + : KAB::ContactEditorWidget( ab, parent, name ) { initGUI(); diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h index c1dc6b8c8..07c5812e1 100644 --- a/kaddressbook/customfieldswidget.h +++ b/kaddressbook/customfieldswidget.h @@ -64,7 +64,7 @@ class AddFieldDialog : public KDialogBase TQ_OBJECT public: - AddFieldDialog( TQWidget *tqparent, const char *name = 0 ); + AddFieldDialog( TQWidget *parent, const char *name = 0 ); TQString title() const; TQString identifier() const; @@ -89,7 +89,7 @@ class FieldWidget : public TQWidget TQ_OBJECT public: - FieldWidget( TQWidget *tqparent, const char *name = 0 ); + FieldWidget( TQWidget *parent, const char *name = 0 ); void addField( const TQString &identifier, const TQString &title, const TQString &type, bool isGlobal ); @@ -124,7 +124,7 @@ class CustomFieldsWidget : public KAB::ContactEditorWidget TQ_OBJECT public: - CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); void loadContact( KABC::Addressee *addr ); void storeContact( KABC::Addressee *addr ); @@ -151,9 +151,9 @@ class CustomFieldsWidget : public KAB::ContactEditorWidget class CustomFieldsWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) { - return new CustomFieldsWidget( ab, tqparent, name ); + return new CustomFieldsWidget( ab, parent, name ); } TQString pageTitle() const { return i18n( "Custom Fields" ); } diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index 2c6d39c95..b206e886d 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -64,7 +64,7 @@ public: }; -KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* tqparent ) : TQWidget( tqparent ), m_addressBook( book ) +KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book ) { Q_ASSERT( m_addressBook ); TQBoxLayout* tqlayout = new TQHBoxLayout( this ); @@ -147,14 +147,14 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const } -KPIM::DistributionListEditor::LineEdit::LineEdit( TQWidget* tqparent ) : KPIM::AddresseeLineEdit( tqparent ) +KPIM::DistributionListEditor::LineEdit::LineEdit( TQWidget* parent ) : KPIM::AddresseeLineEdit( parent ) { allowDistributionLists( false ); } -KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* book, TQWidget* tqparent ) - : KDialogBase( tqparent, /*name=*/0, /*modal=*/ true, /*caption=*/TQString(), KDialogBase::Ok|KDialogBase::Cancel ), d( new DistributionListEditor::EditorWidgetPrivate ) +KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* book, TQWidget* parent ) + : KDialogBase( parent, /*name=*/0, /*modal=*/ true, /*caption=*/TQString(), KDialogBase::Ok|KDialogBase::Cancel ), d( new DistributionListEditor::EditorWidgetPrivate ) { d->addressBook = book; Q_ASSERT( d->addressBook ); diff --git a/kaddressbook/distributionlisteditor.h b/kaddressbook/distributionlisteditor.h index 448221ce4..6cbe9310a 100644 --- a/kaddressbook/distributionlisteditor.h +++ b/kaddressbook/distributionlisteditor.h @@ -41,7 +41,7 @@ class EditorWidget : public KDialogBase Q_OBJECT TQ_OBJECT public: - explicit EditorWidget( KABC::AddressBook* book, TQWidget* tqparent = 0 ); + explicit EditorWidget( KABC::AddressBook* book, TQWidget* parent = 0 ); ~EditorWidget(); void setDistributionList( const KPIM::DistributionList& list ); diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h index e4754e5a9..8be9aadce 100644 --- a/kaddressbook/distributionlisteditor_p.h +++ b/kaddressbook/distributionlisteditor_p.h @@ -44,7 +44,7 @@ class LineEdit : public KPIM::AddresseeLineEdit Q_OBJECT TQ_OBJECT public: - explicit LineEdit( TQWidget* tqparent = 0 ); + explicit LineEdit( TQWidget* parent = 0 ); }; @@ -53,7 +53,7 @@ class Line : public TQWidget Q_OBJECT TQ_OBJECT public: - explicit Line( KABC::AddressBook* book, TQWidget* tqparent = 0 ); + explicit Line( KABC::AddressBook* book, TQWidget* parent = 0 ); void setEntry( const KPIM::DistributionList::Entry& entry ); KPIM::DistributionList::Entry entry() const; diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index 7b515782f..030f58197 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -20,7 +20,7 @@ #include <tqstringlist.h> #include <tqvbuttongroup.h> -KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWidget* tqparent ) : TQWidget( tqparent ), m_core( core ), m_emailGroup( 0 ) +KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWidget* parent ) : TQWidget( parent ), m_core( core ), m_emailGroup( 0 ) { m_mainLayout = new TQVBoxLayout( this ); m_mainLayout->setSpacing( KDialog::spacingHint() ); diff --git a/kaddressbook/distributionlistentryview.h b/kaddressbook/distributionlistentryview.h index 3eba6efa8..e8a58146d 100644 --- a/kaddressbook/distributionlistentryview.h +++ b/kaddressbook/distributionlistentryview.h @@ -27,7 +27,7 @@ class DistributionListEntryView : public TQWidget TQ_OBJECT public: - explicit DistributionListEntryView( KAB::Core* core, TQWidget* tqparent = 0 ); + explicit DistributionListEntryView( KAB::Core* core, TQWidget* parent = 0 ); void setEntry( const KPIM::DistributionList& list, const KPIM::DistributionList::Entry& entry ); public slots: diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 9b4d3f727..c721ae6f5 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -41,7 +41,7 @@ #include <tqregexp.h> #include <tqvalidator.h> -KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* tqparent ) : KDialogBase( tqparent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book ) +KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent ) : KDialogBase( parent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book ) { Q_ASSERT( m_book ); setModal( true ); diff --git a/kaddressbook/distributionlistpicker.h b/kaddressbook/distributionlistpicker.h index 9d7d23faf..22e814f4c 100644 --- a/kaddressbook/distributionlistpicker.h +++ b/kaddressbook/distributionlistpicker.h @@ -40,7 +40,7 @@ class DistributionListPickerDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* tqparent = 0 ); + explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent = 0 ); TQString selectedDistributionList() const; void setLabelText( const TQString& text ); diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index a4d8b8bb0..89d41ab35 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -68,8 +68,8 @@ TQString CryptoWidgetFactory::pageIdentifier() const return "crypto"; } -CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false ) +CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 5, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h index 12f3ba992..4fda99d5a 100644 --- a/kaddressbook/editors/cryptowidget.h +++ b/kaddressbook/editors/cryptowidget.h @@ -39,7 +39,7 @@ class CryptoWidget : public KAB::ContactEditorWidget TQ_OBJECT public: - CryptoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~CryptoWidget(); void loadContact( KABC::Addressee *addr ); @@ -60,9 +60,9 @@ class CryptoWidgetFactory : public KAB::ContactEditorWidgetFactory { public: CryptoWidgetFactory(); - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) { - return new CryptoWidget( ab, tqparent, name ); + return new CryptoWidget( ab, parent, name ); } TQString pageTitle() const; diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp index 1d64c5b98..4b3516ea1 100644 --- a/kaddressbook/editors/imaddresswidget.cpp +++ b/kaddressbook/editors/imaddresswidget.cpp @@ -33,18 +33,18 @@ #include "imaddresswidget.h" -IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols ) - : IMAddressBase( tqparent ) +IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols ) + : IMAddressBase( parent ) { mProtocols = protocols; populateProtocols(); init(); } -IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols, +IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols, KPluginInfo *protocol, const TQString& address, const IMContext& context ) - : IMAddressBase( tqparent ) + : IMAddressBase( parent ) { Q_UNUSED( context ); diff --git a/kaddressbook/editors/imaddresswidget.h b/kaddressbook/editors/imaddresswidget.h index 3cec21cfd..5ac2a1960 100644 --- a/kaddressbook/editors/imaddresswidget.h +++ b/kaddressbook/editors/imaddresswidget.h @@ -45,8 +45,8 @@ class IMAddressWidget : public IMAddressBase TQ_OBJECT public: - IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols); - IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols, + IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols); + IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols, KPluginInfo *protocol, const TQString& address, const IMContext& context = Any ); diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 0c4717b95..533b7d4b7 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -43,9 +43,9 @@ #include "imeditorwidget.h" -IMAddressLVI::IMAddressLVI( KListView *tqparent, KPluginInfo *protocol, +IMAddressLVI::IMAddressLVI( KListView *parent, KPluginInfo *protocol, const TQString &address, const IMContext &context ) - : KListViewItem( tqparent ) + : KListViewItem( parent ) { setProtocol( protocol ); setAddress( address ); @@ -140,8 +140,8 @@ void IMAddressLVI::activate() /*===========================================================================*/ -IMEditorWidget::IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM, const char *name ) - : KDialogBase( tqparent, name, false, i18n( "Edit Instant Messenging Address" ), +IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name ) + : KDialogBase( parent, name, false, i18n( "Edit Instant Messenging Address" ), Help | Ok | Cancel, Ok, false ), mReadOnly( false ) { diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index f1f2708db..3c9b85cee 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -52,7 +52,7 @@ class IMEditorWidget : public KDialogBase TQ_OBJECT public: - IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM, const char *name = 0 ); + IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name = 0 ); ~IMEditorWidget() {}; void loadContact( KABC::Addressee *addr ); @@ -100,7 +100,7 @@ class IMEditorWidget : public KDialogBase class IMAddressLVI : public KListViewItem { public: - IMAddressLVI( KListView *tqparent, KPluginInfo * protocol, + IMAddressLVI( KListView *parent, KPluginInfo * protocol, const TQString &address, const IMContext &context = Any ); void setAddress( const TQString &address ); diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 75677a698..4ecee68a1 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -58,8 +58,8 @@ class EmailValidator : public TQRegExpValidator class EmailItem : public TQListBoxText { public: - EmailItem( TQListBox *tqparent, const TQString &text, bool preferred ) - : TQListBoxText( tqparent, text ), mPreferred( preferred ) + EmailItem( TQListBox *parent, const TQString &text, bool preferred ) + : TQListBoxText( parent, text ), mPreferred( preferred ) {} void setPreferred( bool preferred ) { mPreferred = preferred; } @@ -86,8 +86,8 @@ class EmailItem : public TQListBoxText bool mPreferred; }; -EmailEditWidget::EmailEditWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +EmailEditWidget::EmailEditWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); @@ -171,11 +171,11 @@ void EmailEditWidget::textChanged( const TQString &text ) } -EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *tqparent, +EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n( "Edit Email Addresses" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Help, - tqparent, name, true ) + parent, name, true ) { TQWidget *page = plainPage(); diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h index c73308f0b..3f26bd9e3 100644 --- a/kaddressbook/emaileditwidget.h +++ b/kaddressbook/emaileditwidget.h @@ -47,7 +47,7 @@ class EmailEditWidget : public TQWidget TQ_OBJECT public: - EmailEditWidget( TQWidget *tqparent, const char *name = 0 ); + EmailEditWidget( TQWidget *parent, const char *name = 0 ); ~EmailEditWidget(); void setEmails( const TQStringList &list ); @@ -74,7 +74,7 @@ class EmailEditDialog : public KDialogBase TQ_OBJECT public: - EmailEditDialog( const TQStringList &list, TQWidget *tqparent, + EmailEditDialog( const TQStringList &list, TQWidget *parent, const char *name = 0 ); ~EmailEditDialog(); diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 77f53a976..6e854ebca 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -44,9 +44,9 @@ ExtensionData::ExtensionData() : action( 0 ), widget( 0 ), weight( 0 ), isDetail { } -ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detailsStack, KAB::Core *core, TQObject *tqparent, +ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detailsStack, KAB::Core *core, TQObject *parent, const char *name ) - : TQObject( tqparent, name ), mExtensionBar( extensionBar ), mCore( core ), + : TQObject( parent, name ), mExtensionBar( extensionBar ), mCore( core ), mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 ) { Q_ASSERT( mExtensionBar ); diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h index 5c5a14c4d..f0af5ecce 100644 --- a/kaddressbook/extensionmanager.h +++ b/kaddressbook/extensionmanager.h @@ -59,7 +59,7 @@ class ExtensionManager : public TQObject TQ_OBJECT public: - ExtensionManager( TQWidget *extensionBar, TQWidgetStack *detailsStack, KAB::Core *core, TQObject *tqparent, const char *name = 0 ); + ExtensionManager( TQWidget *extensionBar, TQWidgetStack *detailsStack, KAB::Core *core, TQObject *parent, const char *name = 0 ); ~ExtensionManager(); /** diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 1eac56b08..5a828ad1a 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -44,7 +44,7 @@ #include <tqpushbutton.h> #include <tqtooltip.h> -KAB::DistributionListNg::ListBox::ListBox( TQWidget* tqparent ) : KListBox( tqparent ) +KAB::DistributionListNg::ListBox::ListBox( TQWidget* parent ) : KListBox( parent ) { setAcceptDrops( true ); } @@ -84,9 +84,9 @@ namespace DistributionListNg { class Factory : public KAB::ExtensionFactory { public: - KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name ) + KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name ) { - return new KAB::DistributionListNg::MainWidget( core, tqparent, name ); + return new KAB::DistributionListNg::MainWidget( core, parent, name ); } TQString identifier() const @@ -115,7 +115,7 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const return "distribution_list_editor_ng"; } -KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *tqparent, const char *name ) : KAB::ExtensionWidget( core, tqparent, name ) +KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); tqlayout->setSpacing( KDialog::spacingHint() ); diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h index 090fe0d50..aa6b9ddc0 100644 --- a/kaddressbook/features/distributionlistngwidget.h +++ b/kaddressbook/features/distributionlistngwidget.h @@ -49,7 +49,7 @@ class ListBox : public KListBox Q_OBJECT TQ_OBJECT public: - ListBox( TQWidget* tqparent = 0 ); + ListBox( TQWidget* parent = 0 ); signals: @@ -70,7 +70,7 @@ class MainWidget : public KAB::ExtensionWidget TQ_OBJECT public: - explicit MainWidget( KAB::Core *core, TQWidget *tqparent = 0, const char *name = 0 ); + explicit MainWidget( KAB::Core *core, TQWidget *parent = 0, const char *name = 0 ); //impl TQString title() const; diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index fc8af3abd..9001311d7 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -55,9 +55,9 @@ typedef KABC::DistributionList DistributionList; class DistributionListFactory : public KAB::ExtensionFactory { public: - KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name ) + KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name ) { - return new DistributionListWidget( core, tqparent, name ); + return new DistributionListWidget( core, parent, name ); } TQString identifier() const @@ -81,8 +81,8 @@ extern "C" { class DeletePressedCatcher : public TQObject { public: - DeletePressedCatcher( DistributionListWidget *tqparent ) - : TQObject( tqparent, "DeletePressedCatcher" ), mWidget( tqparent ) + DeletePressedCatcher( DistributionListWidget *parent ) + : TQObject( parent, "DeletePressedCatcher" ), mWidget( parent ) { } @@ -109,9 +109,9 @@ class DeletePressedCatcher : public TQObject class ContactItem : public TQListViewItem { public: - ContactItem( DistributionListView *tqparent, const KABC::Addressee &addressee, + ContactItem( DistributionListView *parent, const KABC::Addressee &addressee, const TQString &email = TQString() ) : - TQListViewItem( tqparent ), + TQListViewItem( parent ), mAddressee( addressee ), mEmail( email ) { @@ -146,9 +146,9 @@ class ContactItem : public TQListViewItem TQString mEmail; }; -DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *tqparent, +DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *parent, const char *name ) - : KAB::ExtensionWidget( core, tqparent, name ) + : KAB::ExtensionWidget( core, parent, name ) #ifndef KDEPIM_NEW_DISTRLISTS , mManager( 0 ) #endif @@ -590,8 +590,8 @@ void DistributionListWidget::changed() } #endif -DistributionListView::DistributionListView( TQWidget *tqparent, const char* name ) - : KListView( tqparent, name ) +DistributionListView::DistributionListView( TQWidget *parent, const char* name ) + : KListView( parent, name ) { setDragEnabled( true ); setAcceptDrops( true ); @@ -622,9 +622,9 @@ void DistributionListView::dropEvent( TQDropEvent *e ) EmailSelector::EmailSelector( const TQStringList &emails, - const TQString ¤t, TQWidget *tqparent ) + const TQString ¤t, TQWidget *parent ) : KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok|Cancel, Ok, - tqparent ) + parent ) { TQFrame *topFrame = plainPage(); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); @@ -657,9 +657,9 @@ TQString EmailSelector::selected() const } TQString EmailSelector::getEmail( const TQStringList &emails, - const TQString ¤t, TQWidget *tqparent, bool &canceled ) + const TQString ¤t, TQWidget *parent, bool &canceled ) { - EmailSelector dlg( emails, current, tqparent ); + EmailSelector dlg( emails, current, parent ); if(dlg.exec()) { canceled = false; diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h index 6890a6a72..7729b50d4 100644 --- a/kaddressbook/features/distributionlistwidget.h +++ b/kaddressbook/features/distributionlistwidget.h @@ -51,7 +51,7 @@ class DistributionListWidget : public KAB::ExtensionWidget TQ_OBJECT public: - DistributionListWidget( KAB::Core*, TQWidget *tqparent, const char *name = 0 ); + DistributionListWidget( KAB::Core*, TQWidget *parent, const char *name = 0 ); virtual ~DistributionListWidget(); void contactsSelectionChanged(); @@ -111,7 +111,7 @@ class DistributionListView : public KListView TQ_OBJECT public: - DistributionListView( TQWidget *tqparent, const char* name = 0 ); + DistributionListView( TQWidget *parent, const char* name = 0 ); protected: void dragEnterEvent( TQDragEnterEvent *e ); @@ -127,12 +127,12 @@ class EmailSelector : public KDialogBase { public: EmailSelector( const TQStringList &emails, const TQString ¤t, - TQWidget *tqparent ); + TQWidget *parent ); TQString selected() const; static TQString getEmail( const TQStringList &emails, const TQString ¤t, - TQWidget *tqparent, bool &canceled ); + TQWidget *parent, bool &canceled ); private: TQButtonGroup *mButtonGroup; diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 0629052ab..6578b6e1e 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -57,8 +57,8 @@ class AddressBookWrapper : public KABC::AddressBook class ResourceItem : public TQCheckListItem { public: - ResourceItem( KListView *tqparent, KABC::Resource *resource ) - : TQCheckListItem( tqparent, resource->resourceName(), CheckBox ), + ResourceItem( KListView *parent, KABC::Resource *resource ) + : TQCheckListItem( parent, resource->resourceName(), CheckBox ), mResource( resource ), mChecked( false ), mIsSubresource( false ), mSubItemsCreated( false ), mResourceIdentifier() @@ -68,9 +68,9 @@ class ResourceItem : public TQCheckListItem mChecked = isOn(); } - ResourceItem( KPIM::ResourceABC *resourceABC, ResourceItem* tqparent, + ResourceItem( KPIM::ResourceABC *resourceABC, ResourceItem* parent, const TQString& resourceIdent ) - : TQCheckListItem( tqparent, resourceABC->subresourceLabel( resourceIdent ), CheckBox ), + : TQCheckListItem( parent, resourceABC->subresourceLabel( resourceIdent ), CheckBox ), mResource( resourceABC ), mChecked( false ), mIsSubresource( true ), mSubItemsCreated( false ), mResourceIdentifier( resourceIdent ) @@ -134,8 +134,8 @@ void ResourceItem::stateChange( bool active ) //// -ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *tqparent, const char *name ) - : KAB::ExtensionWidget( core, tqparent, name ), mManager( 0 ) +ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *parent, const char *name ) + : KAB::ExtensionWidget( core, parent, name ), mManager( 0 ) { initGUI(); @@ -520,9 +520,9 @@ void ResourceSelection::initGUI() class ResourceSelectionFactory : public KAB::ExtensionFactory { public: - KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name ) + KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name ) { - return new ResourceSelection( core, tqparent, name ); + return new ResourceSelection( core, parent, name ); } TQString identifier() const diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h index e8939812b..609f942f2 100644 --- a/kaddressbook/features/resourceselection.h +++ b/kaddressbook/features/resourceselection.h @@ -41,7 +41,7 @@ class ResourceSelection : public KAB::ExtensionWidget TQ_OBJECT public: - ResourceSelection( KAB::Core*, TQWidget *tqparent, const char *name ); + ResourceSelection( KAB::Core*, TQWidget *parent, const char *name ); virtual ~ResourceSelection(); TQString title() const; diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index bb9e255b3..5e1586e11 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -45,9 +45,9 @@ #include "kabprefs.h" #include "filtereditdialog.h" -FilterEditDialog::FilterEditDialog( TQWidget *tqparent, const char *name ) +FilterEditDialog::FilterEditDialog( TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Edit Address Book Filter" ), - Help | Ok | Cancel, Ok, tqparent, name, false, true ) + Help | Ok | Cancel, Ok, parent, name, false, true ) { initGUI(); @@ -161,9 +161,9 @@ void FilterEditDialog::slotHelp() kapp->invokeHelp( "using-filters" ); } -FilterDialog::FilterDialog( TQWidget *tqparent, const char *name ) +FilterDialog::FilterDialog( TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Edit Address Book Filters" ), - Ok | Cancel, Ok, tqparent, name, false, true ) + Ok | Cancel, Ok, parent, name, false, true ) { initGUI(); } diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h index 1d3c64395..23dcfabd5 100644 --- a/kaddressbook/filtereditdialog.h +++ b/kaddressbook/filtereditdialog.h @@ -43,7 +43,7 @@ class FilterDialog : public KDialogBase TQ_OBJECT public: - FilterDialog( TQWidget *tqparent, const char *name = 0 ); + FilterDialog( TQWidget *parent, const char *name = 0 ); ~FilterDialog(); void setFilters( const Filter::List &list ); @@ -73,7 +73,7 @@ class FilterEditDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - FilterEditDialog( TQWidget *tqparent, const char *name = 0 ); + FilterEditDialog( TQWidget *parent, const char *name = 0 ); ~FilterEditDialog(); void setFilter( const Filter &filter ); diff --git a/kaddressbook/filterselectionwidget.cpp b/kaddressbook/filterselectionwidget.cpp index 1b4873175..32bdf7bf6 100644 --- a/kaddressbook/filterselectionwidget.cpp +++ b/kaddressbook/filterselectionwidget.cpp @@ -29,8 +29,8 @@ #include "filterselectionwidget.h" -FilterSelectionWidget::FilterSelectionWidget( TQWidget *tqparent, const char *name ) - : TQHBox( tqparent, name ) +FilterSelectionWidget::FilterSelectionWidget( TQWidget *parent, const char *name ) + : TQHBox( parent, name ) { setSpacing( KDialog::spacingHint() ); diff --git a/kaddressbook/filterselectionwidget.h b/kaddressbook/filterselectionwidget.h index da8077c46..162ea4ccb 100644 --- a/kaddressbook/filterselectionwidget.h +++ b/kaddressbook/filterselectionwidget.h @@ -39,7 +39,7 @@ class FilterSelectionWidget : public TQHBox TQ_OBJECT public: - FilterSelectionWidget( TQWidget *tqparent, const char *name = 0 ); + FilterSelectionWidget( TQWidget *parent, const char *name = 0 ); ~FilterSelectionWidget(); void setItems( const TQStringList &names ); diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index 5a4199072..7b81d9ccb 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -32,8 +32,8 @@ #include "freebusywidget.h" -FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::ContactEditorWidget( ab, tqparent, name ) +FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::ContactEditorWidget( ab, parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/freebusywidget.h b/kaddressbook/freebusywidget.h index a758f1418..f06a574e5 100644 --- a/kaddressbook/freebusywidget.h +++ b/kaddressbook/freebusywidget.h @@ -34,7 +34,7 @@ class FreeBusyWidget : public KAB::ContactEditorWidget TQ_OBJECT public: - FreeBusyWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~FreeBusyWidget(); void loadContact( KABC::Addressee *addr ); @@ -51,9 +51,9 @@ class FreeBusyWidget : public KAB::ContactEditorWidget class FreeBusyWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) { - return new FreeBusyWidget( ab, tqparent, name ); + return new FreeBusyWidget( ab, parent, name ); } TQString pageIdentifier() const { return "misc"; } diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 2b9b32c96..725dde3dc 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -44,8 +44,8 @@ #include "geowidget.h" -GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false ) +GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) { TQLabel *label = 0; @@ -157,9 +157,9 @@ void GeoWidget::editGeoData() -GeoDialog::GeoDialog( TQWidget *tqparent, const char *name ) +GeoDialog::GeoDialog( TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Geo Data Input" ), Ok | Cancel, Ok, - tqparent, name, true, true ), + parent, name, true, true ), mUpdateSexagesimalInput( true ) { TQFrame *page = plainPage(); @@ -482,8 +482,8 @@ int GeoDialog::nearestCity( double x, double y ) const } -GeoMapWidget::GeoMapWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mLatitude( 0 ), mLongitude( 0 ) +GeoMapWidget::GeoMapWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mLatitude( 0 ), mLongitude( 0 ) { setBackgroundMode( NoBackground ); diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h index f6f8dffd5..7021b4fd0 100644 --- a/kaddressbook/geowidget.h +++ b/kaddressbook/geowidget.h @@ -54,7 +54,7 @@ class GeoWidget : public KAB::ContactEditorWidget TQ_OBJECT public: - GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~GeoWidget(); void loadContact( KABC::Addressee *addr ); @@ -81,7 +81,7 @@ class GeoDialog : public KDialogBase TQ_OBJECT public: - GeoDialog( TQWidget *tqparent, const char *name = 0 ); + GeoDialog( TQWidget *parent, const char *name = 0 ); ~GeoDialog(); void setLatitude( double latitude ); @@ -127,7 +127,7 @@ class GeoMapWidget : public TQWidget TQ_OBJECT public: - GeoMapWidget( TQWidget *tqparent, const char *name = 0 ); + GeoMapWidget( TQWidget *parent, const char *name = 0 ); ~GeoMapWidget(); void setLatitude( double latitude ); @@ -151,9 +151,9 @@ class GeoMapWidget : public TQWidget class GeoWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) { - return new GeoWidget( ab, tqparent, name ); + return new GeoWidget( ab, parent, name ); } TQString pageIdentifier() const { return "misc"; } diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index b4219322c..5e1dc85f1 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -47,8 +47,8 @@ #include "imagewidget.h" -ImageLoader::ImageLoader( TQWidget *tqparent ) - : TQObject( 0, "ImageLoader" ), mParent( tqparent ) +ImageLoader::ImageLoader( TQWidget *parent ) + : TQObject( 0, "ImageLoader" ), mParent( parent ) { } @@ -103,8 +103,8 @@ KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok ) } -ImageButton::ImageButton( const TQString &title, TQWidget *tqparent ) - : TQPushButton( title, tqparent ), +ImageButton::ImageButton( const TQString &title, TQWidget *parent ) + : TQPushButton( title, parent ), mReadOnly( false ), mImageLoader( 0 ) { setAcceptDrops( true ); @@ -247,8 +247,8 @@ void ImageButton::clear() } ImageBaseWidget::ImageBaseWidget( const TQString &title, - TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mReadOnly( false ) + TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mReadOnly( false ) { mImageLoader = new ImageLoader( this ); @@ -290,8 +290,8 @@ KABC::Picture ImageBaseWidget::image() const } -ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::ContactEditorWidget( ab, tqparent, name ) +ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::ContactEditorWidget( ab, parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h index 52b9c9c6c..6dbac1955 100644 --- a/kaddressbook/imagewidget.h +++ b/kaddressbook/imagewidget.h @@ -41,7 +41,7 @@ class ImageLoader : public TQObject TQ_OBJECT public: - ImageLoader( TQWidget *tqparent ); + ImageLoader( TQWidget *parent ); KABC::Picture loadPicture( const KURL &url, bool *ok ); @@ -59,7 +59,7 @@ class ImageButton : public TQPushButton TQ_OBJECT public: - ImageButton( const TQString &title, TQWidget *tqparent ); + ImageButton( const TQString &title, TQWidget *parent ); void setReadOnly( bool readOnly ); @@ -101,7 +101,7 @@ class ImageBaseWidget : public TQWidget TQ_OBJECT public: - ImageBaseWidget( const TQString &title, TQWidget *tqparent, const char *name = 0 ); + ImageBaseWidget( const TQString &title, TQWidget *parent, const char *name = 0 ); ~ImageBaseWidget(); /** @@ -129,7 +129,7 @@ class ImageBaseWidget : public TQWidget class ImageWidget : public KAB::ContactEditorWidget { public: - ImageWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); void loadContact( KABC::Addressee *addr ); void storeContact( KABC::Addressee *addr ); @@ -145,9 +145,9 @@ class ImageWidget : public KAB::ContactEditorWidget class ImageWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) { - return new ImageWidget( ab, tqparent, name ); + return new ImageWidget( ab, parent, name ); } TQString pageIdentifier() const { return "misc"; } diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index c7507afcf..2f40f5de3 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/kaddressbook/imeditwidget.cpp @@ -43,8 +43,8 @@ #include "imeditwidget.h" #include "imeditorwidget.h" -IMEditWidget::IMEditWidget( TQWidget *tqparent, KABC::Addressee &addr, const char *name ) - : TQWidget( tqparent, name ), mAddressee(addr) +IMEditWidget::IMEditWidget( TQWidget *parent, KABC::Addressee &addr, const char *name ) + : TQWidget( parent, name ), mAddressee(addr) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h index d528fafe2..03c25fcbb 100644 --- a/kaddressbook/imeditwidget.h +++ b/kaddressbook/imeditwidget.h @@ -47,7 +47,7 @@ class IMEditWidget : public TQWidget TQ_OBJECT public: - IMEditWidget(TQWidget *tqparent, KABC::Addressee &addr, const char *name = 0 ); + IMEditWidget(TQWidget *parent, KABC::Addressee &addr, const char *name = 0 ); ~IMEditWidget(); void setIMs( const TQStringList &list ); diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index 6b3463270..aaad464f1 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -37,8 +37,8 @@ #include "incsearchwidget.h" -IncSearchWidget::IncSearchWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h index fa3a99a2b..4277828d0 100644 --- a/kaddressbook/incsearchwidget.h +++ b/kaddressbook/incsearchwidget.h @@ -38,7 +38,7 @@ class IncSearchWidget : public TQWidget TQ_OBJECT public: - IncSearchWidget( TQWidget *tqparent, const char *name = 0 ); + IncSearchWidget( TQWidget *parent, const char *name = 0 ); ~IncSearchWidget(); KABC::Field::List currentFields() const; diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp index 1f9325ed0..16bec28a7 100644 --- a/kaddressbook/interfaces/configurewidget.cpp +++ b/kaddressbook/interfaces/configurewidget.cpp @@ -27,9 +27,9 @@ using namespace KAB; -ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, +ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ), mAddressBook( ab ) + : TQWidget( parent, name ), mAddressBook( ab ) { } diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index 89e980084..04cea9cf7 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -38,7 +38,7 @@ namespace KAB { class KDE_EXPORT ConfigureWidget : public TQWidget { public: - ConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~ConfigureWidget(); /** diff --git a/kaddressbook/interfaces/contacteditorwidget.cpp b/kaddressbook/interfaces/contacteditorwidget.cpp index 230f8d019..3059b7a40 100644 --- a/kaddressbook/interfaces/contacteditorwidget.cpp +++ b/kaddressbook/interfaces/contacteditorwidget.cpp @@ -26,8 +26,8 @@ using namespace KAB; ContactEditorWidget::ContactEditorWidget( KABC::AddressBook *ab, - TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mAddressBook( ab ), mModified( false ) + TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mAddressBook( ab ), mModified( false ) { } diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index dc8039b60..5903981dd 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -42,7 +42,7 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget public: typedef TQValueList<ContactEditorWidget*> List; - ContactEditorWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + ContactEditorWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~ContactEditorWidget(); /** @@ -117,7 +117,7 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget class ContactEditorWidgetFactory : public KLibFactory { public: - virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, + virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ) = 0; /** diff --git a/kaddressbook/interfaces/core.cpp b/kaddressbook/interfaces/core.cpp index b604d6564..f359bc3ab 100644 --- a/kaddressbook/interfaces/core.cpp +++ b/kaddressbook/interfaces/core.cpp @@ -25,8 +25,8 @@ using namespace KAB; -Core::Core( KXMLGUIClient *client, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), mGUIClient( client ) +Core::Core( KXMLGUIClient *client, TQObject *parent, const char *name ) + : TQObject( parent, name ), mGUIClient( client ) { } diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index b4289249f..ac572004f 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -58,7 +58,7 @@ class KDE_EXPORT Core : public TQObject TQ_OBJECT public: - Core( KXMLGUIClient *client, TQObject *tqparent, const char *name = 0 ); + Core( KXMLGUIClient *client, TQObject *parent, const char *name = 0 ); /** Returns a pointer to the StdAddressBook of the application. @@ -96,10 +96,10 @@ class KDE_EXPORT Core : public TQObject resource or a null pointer if no resource was selected by the user. */ - virtual KABC::Resource *requestResource( TQWidget *tqparent ) = 0; + virtual KABC::Resource *requestResource( TQWidget *parent ) = 0; /** - Returns the tqparent widget. + Returns the parent widget. */ virtual TQWidget *widget() const = 0; diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp index bae99b03f..63f90200b 100644 --- a/kaddressbook/interfaces/extensionwidget.cpp +++ b/kaddressbook/interfaces/extensionwidget.cpp @@ -27,9 +27,9 @@ using namespace KAB; -ExtensionWidget::ExtensionWidget( Core *core, TQWidget *tqparent, +ExtensionWidget::ExtensionWidget( Core *core, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ), mCore( core ) + : TQWidget( parent, name ), mCore( core ) { } diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 7b3daca9f..8302c5b9a 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -42,7 +42,7 @@ class KDE_EXPORT ExtensionWidget : public TQWidget TQ_OBJECT public: - ExtensionWidget( Core *core, TQWidget *tqparent, const char *name = 0 ); + ExtensionWidget( Core *core, TQWidget *parent, const char *name = 0 ); ~ExtensionWidget(); /** @@ -92,7 +92,7 @@ class KDE_EXPORT ExtensionWidget : public TQWidget class ExtensionFactory : public KLibFactory { public: - virtual ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, + virtual ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name = 0 ) = 0; virtual ConfigureWidget *configureWidget( TQWidget*, const char* = 0 ) diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index 8e8864d85..6b4340fdf 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -40,9 +40,9 @@ class XXPort::XXPortPrivate KApplication *mKApp; }; -XXPort::XXPort( KABC::AddressBook *ab, TQWidget *tqparent, +XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : TQObject( tqparent, name ), mAddressBook( ab ), mParentWidget( tqparent ), + : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ), d( new XXPortPrivate ) { setInstance( new KInstance( "kaddressbook" ) ); diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 0f24f5c0e..996767185 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -45,10 +45,10 @@ class KApplication; */ #define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \ class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ - KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) \ + KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name ) \ { const char *cat = catalog; \ if (cat) KGlobal::locale()->insertCatalogue(cat); \ - return new XXPortClass( ab, tqparent, name ); \ + return new XXPortClass( ab, parent, name ); \ } \ }; \ K_EXPORT_COMPONENT_FACTORY( libname, localXXPortFactory ) @@ -71,7 +71,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient TQ_OBJECT public: - XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~XXPort(); /** @@ -143,7 +143,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient KABC::AddressBook *addressBook() const; /** - Returns a pointer to the tqparent widget. It can be used as tqparent for + Returns a pointer to the parent widget. It can be used as parent for message boxes. */ TQWidget *parentWidget() const; @@ -163,7 +163,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient class XXPortFactory : public KLibFactory { public: - virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *tqparent, + virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ) = 0; protected: diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index e4a712a9d..2b603fe23 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -43,7 +43,7 @@ class JumpButton : public TQPushButton { public: JumpButton( const TQString &firstChar, const TQString &lastChar, - TQWidget *tqparent ); + TQWidget *parent ); TQString firstChar() const { return mChar; } @@ -52,8 +52,8 @@ class JumpButton : public TQPushButton }; JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar, - TQWidget *tqparent ) - : TQPushButton( "", tqparent ), mChar( firstChar ) + TQWidget *parent ) + : TQPushButton( "", parent ), mChar( firstChar ) { setToggleButton( true ); if ( !lastChar.isEmpty() ) @@ -62,8 +62,8 @@ JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar, setText( firstChar.upper() ); } -JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mCore( core ) +JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mCore( core ) { setMinimumSize( 1, 1 ); diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h index 6408582d9..d7471cea7 100644 --- a/kaddressbook/jumpbuttonbar.h +++ b/kaddressbook/jumpbuttonbar.h @@ -50,7 +50,7 @@ class JumpButtonBar : public TQWidget TQ_OBJECT public: - JumpButtonBar( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ); + JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *name = 0 ); ~JumpButtonBar(); public slots: diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index db10f8f96..fac69a0a3 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -92,16 +92,16 @@ #include "kabcore.h" -KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent, +KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, const TQString &file, const char *name ) - : KAB::Core( client, TQT_TQOBJECT(tqparent), name ), mStatusBar( 0 ), mViewManager( 0 ), + : KAB::Core( client, TQT_TQOBJECT(parent), name ), mStatusBar( 0 ), mViewManager( 0 ), mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ), mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ), mModified( false ) { - mWidget = new TQWidget( tqparent, name ); + mWidget = new TQWidget( parent, name ); - mIsPart = !tqparent->isA( "KAddressBookMain" ); + mIsPart = !parent->isA( "KAddressBookMain" ); mAddressBookChangedTimer = new TQTimer( this ); connect( mAddressBookChangedTimer, TQT_SIGNAL( timeout() ), @@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent, mAddressBook = new KABC::AddressBook; mAddressBook->addResource( new KABC::ResourceFile( file ) ); if ( !mAddressBook->load() ) { - KMessageBox::error( tqparent, i18n("Unable to load '%1'.").tqarg( file ) ); + KMessageBox::error( parent, i18n("Unable to load '%1'.").tqarg( file ) ); } } mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) ); @@ -140,7 +140,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent, mAddressBook->addCustomField( i18n( "Blog" ), KABC::Field::Personal, "BlogFeed", "KADDRESSBOOK" ); - mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(tqparent) ); + mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(parent) ); connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ), this, TQT_SLOT( slotContactsUpdated() ) ); @@ -270,7 +270,7 @@ TQStringList KABCore::selectedUIDs() const return mViewManager->selectedUids(); } -KABC::Resource *KABCore::requestResource( TQWidget *tqparent ) +KABC::Resource *KABCore::requestResource( TQWidget *parent ) { TQPtrList<KABC::Resource> kabcResources = addressBook()->resources(); @@ -301,7 +301,7 @@ KABC::Resource *KABCore::requestResource( TQWidget *tqparent ) } } - KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, tqparent ); + KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); return static_cast<KABC::Resource*>( res ); // upcast } @@ -1152,10 +1152,10 @@ void KABCore::addressBookChanged() updateCategories(); } -AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *tqparent, +AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *parent, const char *name ) { - AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, tqparent, + AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent, name ? name : "editorDialog" ); connect( dialog, TQT_SIGNAL( contactModified( const KABC::Addressee& ) ), TQT_SLOT( contactModified( const KABC::Addressee& ) ) ); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index aed5e08f1..f8c166a2a 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -86,7 +86,7 @@ class KDE_EXPORT KABCore : public KAB::Core TQ_OBJECT public: - KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent, + KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, const TQString &file = TQString(), const char *name = 0 ); ~KABCore(); @@ -131,10 +131,10 @@ class KDE_EXPORT KABCore : public KAB::Core resource or a null pointer if no resource was selected by the user. */ - KABC::Resource *requestResource( TQWidget *tqparent ); + KABC::Resource *requestResource( TQWidget *parent ); /** - Returns the tqparent widget. + Returns the parent widget. */ TQWidget *widget() const; @@ -435,7 +435,7 @@ class KDE_EXPORT KABCore : public KAB::Core void updateCategories(); TQStringList allCategories() const; - AddresseeEditorDialog *createAddresseeEditorDialog( TQWidget *tqparent, + AddresseeEditorDialog *createAddresseeEditorDialog( TQWidget *parent, const char *name = 0 ); TQWidget *mWidget; diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 88cd03109..5f978b4d1 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -43,9 +43,9 @@ typedef KParts::GenericFactory< KAddressbookPart > KAddressbookFactory; K_EXPORT_COMPONENT_FACTORY( libkaddressbookpart, KAddressbookFactory ) KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList & ) - : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( tqparent, name ) + : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( parent, name ) { setInstance( KAddressbookFactory::instance() ); diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h index 264209314..366d65cbd 100644 --- a/kaddressbook/kaddressbook_part.h +++ b/kaddressbook/kaddressbook_part.h @@ -41,7 +41,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook public: KAddressbookPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList& ); + TQObject *parent, const char *name, const TQStringList& ); virtual ~KAddressbookPart(); static KAboutData *createAboutData(); diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index 9f1aa3cec..43d709d2d 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -37,9 +37,9 @@ #include "kaddressbookview.h" -KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *tqparent, +KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ), mCore( core ), mFieldList() + : TQWidget( parent, name ), mCore( core ), mFieldList() { initGUI(); @@ -194,10 +194,10 @@ void KAddressBookView::updateView() } ViewConfigureWidget *ViewFactory::configureWidget( KABC::AddressBook *ab, - TQWidget *tqparent, + TQWidget *parent, const char *name ) { - return new ViewConfigureWidget( ab, tqparent, name ); + return new ViewConfigureWidget( ab, parent, name ); } #include "kaddressbookview.moc" diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index eca5521bc..ed4cfc6c4 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -61,7 +61,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget public: enum DefaultFilterType { None = 0, Active = 1, Specific = 2 }; - KAddressBookView( KAB::Core *core, TQWidget *tqparent, const char *name ); + KAddressBookView( KAB::Core *core, TQWidget *parent, const char *name ); virtual ~KAddressBookView(); /** @@ -251,8 +251,8 @@ class KDE_EXPORT KAddressBookView : public TQWidget KABC::Addressee::List addressees(); /** - This method returns the widget that should be used as the tqparent for - all view components. By using this widget as the tqparent and not + This method returns the widget that should be used as the parent for + all view components. By using this widget as the parent and not 'this', the view subclass has the option of placing other widgets around the view (ie: search fields, etc). Do not delete this widget! */ @@ -276,7 +276,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget class KDE_EXPORT ViewFactory : public KLibFactory { public: - virtual KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, + virtual KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name = 0 ) = 0; /** @return The type of the view. This is normally a small one word @@ -301,7 +301,7 @@ class KDE_EXPORT ViewFactory : public KLibFactory <B>not</B> be called. */ virtual ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, - TQWidget *tqparent, + TQWidget *parent, const char *name = 0 ); protected: diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index a6174dffd..155f6f6ba 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -33,8 +33,8 @@ #include <klocale.h> #include "addhostdialog.h" -AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* tqparent, const char* name ) - : KDialogBase( Plain, i18n( "Add Host" ), Ok | Cancel, Ok, tqparent, name, true, true ) +AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const char* name ) + : KDialogBase( Plain, i18n( "Add Host" ), Ok | Cancel, Ok, parent, name, true, true ) { mServer = server; diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h index 956892d9f..6a57861a1 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.h +++ b/kaddressbook/kcmconfigs/addhostdialog.h @@ -38,7 +38,7 @@ class AddHostDialog : public KDialogBase TQ_OBJECT public: - AddHostDialog( KPIM::LdapServer* server, TQWidget* tqparent = 0, const char* name = 0 ); + AddHostDialog( KPIM::LdapServer* server, TQWidget* parent = 0, const char* name = 0 ); ~AddHostDialog(); signals: diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index f1a3f525d..8c04002d5 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -41,8 +41,8 @@ #include "addresseewidget.h" NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, - TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mTitle( title ), mLabel( label ) + TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mTitle( title ), mLabel( label ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); @@ -131,8 +131,8 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item ) -AddresseeWidget::AddresseeWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h index 8c81ac23d..b7c55b9ea 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.h +++ b/kaddressbook/kcmconfigs/addresseewidget.h @@ -39,7 +39,7 @@ class NamePartWidget : public TQWidget TQ_OBJECT public: - NamePartWidget( const TQString &title, const TQString &label, TQWidget *tqparent, + NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent, const char *name = 0 ); ~NamePartWidget(); @@ -72,7 +72,7 @@ class AddresseeWidget : public TQWidget TQ_OBJECT public: - AddresseeWidget( TQWidget *tqparent, const char *name = 0 ); + AddresseeWidget( TQWidget *parent, const char *name = 0 ); ~AddresseeWidget(); void restoreSettings(); diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp index 62716886b..68f4643ab 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp @@ -30,8 +30,8 @@ #include "extensionwidget.h" ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config, - TQWidget *tqparent, const char *name ) - : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, tqparent, + TQWidget *parent, const char *name ) + : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent, name, true, true ), mWidget( 0 ), mConfig( config ) { TQFrame *page = plainPage(); diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h index de5f506b8..6c595b443 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.h +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h @@ -39,7 +39,7 @@ class ExtensionConfigDialog : public KDialogBase public: ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); ~ExtensionConfigDialog(); protected slots: diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index f2899ba35..a3775b369 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -45,8 +45,8 @@ #include "kabconfigwidget.h" -KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h index e169f2ef5..1a4fc666a 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.h +++ b/kaddressbook/kcmconfigs/kabconfigwidget.h @@ -42,7 +42,7 @@ class KABConfigWidget : public TQWidget TQ_OBJECT public: - KABConfigWidget( TQWidget *tqparent, const char *name = 0 ); + KABConfigWidget( TQWidget *parent, const char *name = 0 ); void restoreSettings(); void saveSettings(); diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index a504af0bb..3ceca5b52 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -35,13 +35,13 @@ extern "C" { - KDE_EXPORT KCModule *create_kabconfig( TQWidget *tqparent, const char * ) { - return new KCMKabConfig( tqparent, "kcmkabconfig" ); + KDE_EXPORT KCModule *create_kabconfig( TQWidget *parent, const char * ) { + return new KCMKabConfig( parent, "kcmkabconfig" ); } } -KCMKabConfig::KCMKabConfig( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h index 74232946f..42348145b 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.h +++ b/kaddressbook/kcmconfigs/kcmkabconfig.h @@ -34,7 +34,7 @@ class KCMKabConfig : public KCModule TQ_OBJECT public: - KCMKabConfig( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKabConfig( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index 8c0fa7316..d6974a1b8 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -33,13 +33,13 @@ extern "C" { - KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *tqparent, const char * ) { - return new KCMKabCustomFields( tqparent, "kcmkabcustomfields" ); + KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *parent, const char * ) { + return new KCMKabCustomFields( parent, "kcmkabcustomfields" ); } } -KCMKabCustomFields::KCMKabCustomFields( TQWidget *tqparent, const char *name ) - : KCMDesignerFields( tqparent, name ) +KCMKabCustomFields::KCMKabCustomFields( TQWidget *parent, const char *name ) + : KCMDesignerFields( parent, name ) { } diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.h b/kaddressbook/kcmconfigs/kcmkabcustomfields.h index 4eb30a880..72874e1b1 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.h +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.h @@ -28,7 +28,7 @@ class KCMKabCustomFields : public KPIM::KCMDesignerFields { public: - KCMKabCustomFields( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKabCustomFields( TQWidget *parent = 0, const char *name = 0 ); protected: TQString localUiDir(); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index b2f657c87..e6f25529c 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -36,13 +36,13 @@ extern "C" { - KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *tqparent, const char * ) { - return new KCMKabLdapConfig( tqparent, "kcmkabldapconfig" ); + KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *parent, const char * ) { + return new KCMKabLdapConfig( parent, "kcmkabldapconfig" ); } } -KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); mConfigWidget = new LDAPOptionsWidget( this ); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h index 10ec0d211..cfa7028dd 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h @@ -36,7 +36,7 @@ class KCMKabLdapConfig : public KCModule TQ_OBJECT public: - KCMKabLdapConfig( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKabLdapConfig( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index 996da4287..a091c0f0c 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -45,8 +45,8 @@ class LDAPItem : public TQCheckListItem { public: - LDAPItem( TQListView *tqparent, const KPIM::LdapServer &server, bool isActive = false ) - : TQCheckListItem( tqparent, tqparent->lastItem(), TQString(), TQCheckListItem::CheckBox ), + LDAPItem( TQListView *parent, const KPIM::LdapServer &server, bool isActive = false ) + : TQCheckListItem( parent, parent->lastItem(), TQString(), TQCheckListItem::CheckBox ), mIsActive( isActive ) { setServer( server ); @@ -69,8 +69,8 @@ class LDAPItem : public TQCheckListItem bool mIsActive; }; -LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { initGUI(); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h index 17fbe6e6f..f8e834b62 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.h +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h @@ -37,7 +37,7 @@ class LDAPOptionsWidget : public TQWidget TQ_OBJECT public: - LDAPOptionsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + LDAPOptionsWidget( TQWidget* parent = 0, const char* name = 0 ); ~LDAPOptionsWidget(); void restoreSettings(); diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 1b6e77440..739672fc7 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -38,8 +38,8 @@ #include "keywidget.h" -KeyWidget::KeyWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KeyWidget::KeyWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h index 7e9a7b28f..700a2fc80 100644 --- a/kaddressbook/keywidget.h +++ b/kaddressbook/keywidget.h @@ -37,7 +37,7 @@ class KeyWidget : public TQWidget TQ_OBJECT public: - KeyWidget( TQWidget *tqparent, const char *name = 0 ); + KeyWidget( TQWidget *parent, const char *name = 0 ); ~KeyWidget(); void setKeys( const KABC::Key::List &list ); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 19b5dd6cf..8d5b90d97 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -104,8 +104,8 @@ static TQMap<TQString, TQString>& adrbookattr2ldap() class ContactListItem : public TQListViewItem { public: - ContactListItem( TQListView* tqparent, const KPIM::LdapAttrMap& attrs ) - : TQListViewItem( tqparent ), mAttrs( attrs ) + ContactListItem( TQListView* parent, const KPIM::LdapAttrMap& attrs ) + : TQListViewItem( parent ), mAttrs( attrs ) { } KPIM::LdapAttrMap mAttrs; @@ -139,9 +139,9 @@ TQValueList<ContactListItem*> LDAPSearchDialog::Private::selectedItems( TQListVi } LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, - TQWidget* tqparent, const char* name ) + TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | User2 | - Cancel, Default, tqparent, name, false, true ), + Cancel, Default, parent, name, false, true ), mAddressBook( ab ), mCore( core ), d( new Private ) { setButtonCancel( KStdGuiItem::close() ); diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h index 0d9727f6e..04757e51f 100644 --- a/kaddressbook/ldapsearchdialog.h +++ b/kaddressbook/ldapsearchdialog.h @@ -53,7 +53,7 @@ class LDAPSearchDialog : public KDialogBase TQ_OBJECT public: - LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* tqparent, const char* name = 0 ); + LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name = 0 ); ~LDAPSearchDialog(); bool isOK() const { return mIsOK; } diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 248c92bdc..4bb6e3700 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -46,9 +46,9 @@ #include "nameeditdialog.h" NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type, - bool readOnly, TQWidget *tqparent, const char *name ) + bool readOnly, TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Edit Contact Name" ), Help | Ok | Cancel, - Ok, tqparent, name, true ), mAddressee( addr ) + Ok, parent, name, true ), mAddressee( addr ) { TQWidget *page = plainPage(); TQGridLayout *tqlayout = new TQGridLayout( page ); diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h index 8a160073c..09d13c78d 100644 --- a/kaddressbook/nameeditdialog.h +++ b/kaddressbook/nameeditdialog.h @@ -54,7 +54,7 @@ class NameEditDialog : public KDialogBase }; NameEditDialog( const KABC::Addressee &addr, int type, - bool readOnly, TQWidget *tqparent, const char *name = 0 ); + bool readOnly, TQWidget *parent, const char *name = 0 ); ~NameEditDialog(); TQString familyName() const; diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 4a394621b..5c5733142 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -46,8 +46,8 @@ #include "phoneeditwidget.h" -PhoneTypeCombo::PhoneTypeCombo( TQWidget *tqparent ) - : KComboBox( tqparent, "TypeCombo" ), +PhoneTypeCombo::PhoneTypeCombo( TQWidget *parent ) + : KComboBox( parent, "TypeCombo" ), mType( KABC::PhoneNumber::Home ), mLastSelected( 0 ), mTypeList( KABC::PhoneNumber::typeList() ) @@ -126,8 +126,8 @@ void PhoneTypeCombo::otherSelected() update(); } -PhoneNumberWidget::PhoneNumberWidget( TQWidget *tqparent ) - : TQWidget( tqparent ) +PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent ) + : TQWidget( parent ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 ); @@ -166,8 +166,8 @@ void PhoneNumberWidget::setReadOnly( bool readOnly ) } -PhoneEditWidget::PhoneEditWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mReadOnly( false ) +PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mReadOnly( false ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 ); tqlayout->setSpacing( KDialog::spacingHint() ); @@ -291,9 +291,9 @@ void PhoneEditWidget::changed( int pos ) /////////////////////////////////////////// // PhoneTypeDialog -PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *tqparent ) +PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent ) : KDialogBase( Plain, i18n( "Edit Phone Number" ), Ok | Cancel, Ok, - tqparent, "PhoneTypeDialog", true ), + parent, "PhoneTypeDialog", true ), mType( type ) { TQWidget *page = plainPage(); diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h index aa8eb4d54..a49f4aa9f 100644 --- a/kaddressbook/phoneeditwidget.h +++ b/kaddressbook/phoneeditwidget.h @@ -42,7 +42,7 @@ class PhoneTypeCombo : public KComboBox TQ_OBJECT public: - PhoneTypeCombo( TQWidget *tqparent ); + PhoneTypeCombo( TQWidget *parent ); ~PhoneTypeCombo(); void setType( int type ); @@ -69,7 +69,7 @@ class PhoneNumberWidget : public TQWidget TQ_OBJECT public: - PhoneNumberWidget( TQWidget *tqparent ); + PhoneNumberWidget( TQWidget *parent ); void setNumber( const KABC::PhoneNumber &number ); KABC::PhoneNumber number() const; @@ -94,7 +94,7 @@ class PhoneEditWidget : public TQWidget TQ_OBJECT public: - PhoneEditWidget( TQWidget *tqparent, const char *name = 0 ); + PhoneEditWidget( TQWidget *parent, const char *name = 0 ); ~PhoneEditWidget(); void setPhoneNumbers( const KABC::PhoneNumber::List &list ); @@ -133,7 +133,7 @@ class PhoneTypeDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - PhoneTypeDialog( int type, TQWidget *tqparent ); + PhoneTypeDialog( int type, TQWidget *parent ); int type() const; diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 13e4fb4e4..5d970b3b7 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -63,9 +63,9 @@ const char *ContactHeaderForeColor = "ContactHeaderForeColor"; const char *ContactHeaderBGColor = "ContactHeaderBGColor"; -DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *tqparent, const char *name ) - : PrintStyle( tqparent, name ), - mPageAppearance( new AppearancePage( tqparent, "AppearancePage" ) ), +DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *name ) + : PrintStyle( parent, name ), + mPageAppearance( new AppearancePage( parent, "AppearancePage" ) ), mPainter( 0 ), mPrintProgress( 0 ) { @@ -272,9 +272,9 @@ bool DetailledPrintStyle::printEntries( const KABC::Addressee::List &contacts, return true; } -DetailledPrintStyleFactory::DetailledPrintStyleFactory( PrintingWizard *tqparent, +DetailledPrintStyleFactory::DetailledPrintStyleFactory( PrintingWizard *parent, const char *name ) - : PrintStyleFactory( tqparent, name ) + : PrintStyleFactory( parent, name ) { } diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h index 977bcd494..7ae1afde8 100644 --- a/kaddressbook/printing/detailledstyle.h +++ b/kaddressbook/printing/detailledstyle.h @@ -39,7 +39,7 @@ class DetailledPrintStyle : public PrintStyle TQ_OBJECT public: - DetailledPrintStyle( PrintingWizard *tqparent, const char *name = 0 ); + DetailledPrintStyle( PrintingWizard *parent, const char *name = 0 ); ~DetailledPrintStyle(); void print( const KABC::Addressee::List &contacts, PrintProgress* ); @@ -58,7 +58,7 @@ class DetailledPrintStyle : public PrintStyle class DetailledPrintStyleFactory : public PrintStyleFactory { public: - DetailledPrintStyleFactory( PrintingWizard *tqparent, const char *name = 0 ); + DetailledPrintStyleFactory( PrintingWizard *parent, const char *name = 0 ); PrintStyle *create() const; TQString description() const; diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 2301bb16c..746677ec8 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -43,8 +43,8 @@ using namespace KABPrinting; const int mFieldSpacingHint = 2; -MikesStyle::MikesStyle( PrintingWizard *tqparent, const char *name ) - : PrintStyle( tqparent, name ) +MikesStyle::MikesStyle( PrintingWizard *parent, const char *name ) + : PrintStyle( parent, name ) { setPreview( "mike-style.png" ); } @@ -244,8 +244,8 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr, } -MikesStyleFactory::MikesStyleFactory( PrintingWizard *tqparent, const char *name ) - : PrintStyleFactory( tqparent, name ) +MikesStyleFactory::MikesStyleFactory( PrintingWizard *parent, const char *name ) + : PrintStyleFactory( parent, name ) { } diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h index 6b61287d6..d8c4e5ce7 100644 --- a/kaddressbook/printing/mikesstyle.h +++ b/kaddressbook/printing/mikesstyle.h @@ -39,7 +39,7 @@ class MikesStyle : public PrintStyle TQ_OBJECT public: - MikesStyle( PrintingWizard *tqparent, const char *name ); + MikesStyle( PrintingWizard *parent, const char *name ); ~MikesStyle(); void print( const KABC::Addressee::List&, PrintProgress* ); @@ -55,7 +55,7 @@ class MikesStyle : public PrintStyle class MikesStyleFactory : public PrintStyleFactory { public: - MikesStyleFactory( PrintingWizard *tqparent, const char *name = 0 ); + MikesStyleFactory( PrintingWizard *parent, const char *name = 0 ); PrintStyle *create() const; TQString description() const; diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index e42621dee..1ea33d53b 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -53,9 +53,9 @@ using namespace KABPrinting; PrintingWizard::PrintingWizard( KPrinter *printer, KABC::AddressBook* ab, - const TQStringList& selection, TQWidget *tqparent, + const TQStringList& selection, TQWidget *parent, const char* name ) - : KWizard( tqparent, name ), mPrinter( printer ), mAddressBook( ab ), + : KWizard( parent, name ), mPrinter( printer ), mAddressBook( ab ), mSelection( selection ), mStyle( 0 ) { mSelectionPage = new SelectionPage( this ); diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h index 54442075c..16b8e982d 100644 --- a/kaddressbook/printing/printingwizard.h +++ b/kaddressbook/printing/printingwizard.h @@ -59,7 +59,7 @@ class PrintingWizard : public KWizard PrintingWizard( KPrinter *printer, KABC::AddressBook* ab, const TQStringList& selection, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~PrintingWizard(); /** diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index 9e0e3aa91..3a9c00d19 100644 --- a/kaddressbook/printing/printprogress.cpp +++ b/kaddressbook/printing/printprogress.cpp @@ -34,8 +34,8 @@ using namespace KABPrinting; -PrintProgress::PrintProgress( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +PrintProgress::PrintProgress( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { setCaption( i18n( "Printing: Progress" ) ); diff --git a/kaddressbook/printing/printprogress.h b/kaddressbook/printing/printprogress.h index a27c5fc3f..f4e726589 100644 --- a/kaddressbook/printing/printprogress.h +++ b/kaddressbook/printing/printprogress.h @@ -43,7 +43,7 @@ class PrintProgress : public TQWidget TQ_OBJECT public: - PrintProgress( TQWidget *tqparent, const char *name = 0 ); + PrintProgress( TQWidget *parent, const char *name = 0 ); ~PrintProgress(); /** diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp index 1c0c79710..9387db325 100644 --- a/kaddressbook/printing/printstyle.cpp +++ b/kaddressbook/printing/printstyle.cpp @@ -32,8 +32,8 @@ using namespace KABPrinting; -PrintStyle::PrintStyle( PrintingWizard* tqparent, const char* name ) - : TQObject( tqparent, name ), mWizard( tqparent ), mSortField( 0 ) +PrintStyle::PrintStyle( PrintingWizard* parent, const char* name ) + : TQObject( parent, name ), mWizard( parent ), mSortField( 0 ) { } @@ -118,8 +118,8 @@ bool PrintStyle::preferredSortType() return mSortType; } -PrintStyleFactory::PrintStyleFactory( PrintingWizard* tqparent, const char* name ) - : mParent( tqparent ), mName( name ) +PrintStyleFactory::PrintStyleFactory( PrintingWizard* parent, const char* name ) + : mParent( parent ), mName( name ) { } diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h index f7e471e25..e7e6d9310 100644 --- a/kaddressbook/printing/printstyle.h +++ b/kaddressbook/printing/printstyle.h @@ -63,7 +63,7 @@ class PrintStyle : public TQObject TQ_OBJECT public: - PrintStyle( PrintingWizard* tqparent, const char* name = 0 ); + PrintStyle( PrintingWizard* parent, const char* name = 0 ); virtual ~PrintStyle(); /** @@ -151,7 +151,7 @@ class PrintStyle : public TQObject class PrintStyleFactory { public: - PrintStyleFactory( PrintingWizard* tqparent, const char* name = 0 ); + PrintStyleFactory( PrintingWizard* parent, const char* name = 0 ); virtual ~PrintStyleFactory(); virtual PrintStyle *create() const = 0; diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index 516431a55..e71c27891 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -38,8 +38,8 @@ #include "selectionpage.h" -SelectionPage::SelectionPage( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +SelectionPage::SelectionPage( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { setCaption( i18n( "Choose Which Contacts to Print" ) ); diff --git a/kaddressbook/printing/selectionpage.h b/kaddressbook/printing/selectionpage.h index dded01ecd..8e566f33b 100644 --- a/kaddressbook/printing/selectionpage.h +++ b/kaddressbook/printing/selectionpage.h @@ -38,7 +38,7 @@ class SelectionPage : public TQWidget TQ_OBJECT public: - SelectionPage( TQWidget* tqparent = 0, const char* name = 0 ); + SelectionPage( TQWidget* parent = 0, const char* name = 0 ); ~SelectionPage(); void setFilters( const TQStringList& ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index 760f71d6c..b1c29b464 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -34,8 +34,8 @@ #include "stylepage.h" -StylePage::StylePage( KABC::AddressBook *ab, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ), mAddressBook( ab ) +StylePage::StylePage( KABC::AddressBook *ab, TQWidget* parent, const char* name ) + : TQWidget( parent, name ), mAddressBook( ab ) { initGUI(); diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h index 24d424597..920d9a9d0 100644 --- a/kaddressbook/printing/stylepage.h +++ b/kaddressbook/printing/stylepage.h @@ -41,7 +41,7 @@ class StylePage : public TQWidget TQ_OBJECT public: - StylePage( KABC::AddressBook *ab, TQWidget* tqparent = 0, const char* name = 0 ); + StylePage( KABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 ); ~StylePage(); /** diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp index 7a24e1b9d..3bad8eb73 100644 --- a/kaddressbook/searchmanager.cpp +++ b/kaddressbook/searchmanager.cpp @@ -30,8 +30,8 @@ using namespace KAB; SearchManager::SearchManager( KABC::AddressBook *ab, - TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), mAddressBook( ab ) + TQObject *parent, const char *name ) + : TQObject( parent, name ), mAddressBook( ab ) { } diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h index 8443c7d36..d605ecf75 100644 --- a/kaddressbook/searchmanager.h +++ b/kaddressbook/searchmanager.h @@ -48,7 +48,7 @@ class SearchManager : public TQObject }; SearchManager( KABC::AddressBook *ab, - TQObject *tqparent, const char *name = 0 ); + TQObject *parent, const char *name = 0 ); /** This method takes a pattern and searches for a match of the specified diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index 34ff25ebf..29942cb71 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -29,8 +29,8 @@ #include "secrecywidget.h" -SecrecyWidget::SecrecyWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/secrecywidget.h b/kaddressbook/secrecywidget.h index 40492587e..c872eb2c4 100644 --- a/kaddressbook/secrecywidget.h +++ b/kaddressbook/secrecywidget.h @@ -35,7 +35,7 @@ class SecrecyWidget : public TQWidget TQ_OBJECT public: - SecrecyWidget( TQWidget *tqparent, const char *name = 0 ); + SecrecyWidget( TQWidget *parent, const char *name = 0 ); ~SecrecyWidget(); void setSecrecy( const KABC::Secrecy &secrecy ); diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp index d5eb004d5..3a371dc67 100644 --- a/kaddressbook/simpleaddresseeeditor.cpp +++ b/kaddressbook/simpleaddresseeeditor.cpp @@ -30,8 +30,8 @@ #include "simpleaddresseeeditor.h" -SimpleAddresseeEditor::SimpleAddresseeEditor( TQWidget *tqparent, const char *name ) - : AddresseeEditorBase( tqparent, name ), +SimpleAddresseeEditor::SimpleAddresseeEditor( TQWidget *parent, const char *name ) + : AddresseeEditorBase( parent, name ), mDirty( false ), mBlockModified( false ) { diff --git a/kaddressbook/simpleaddresseeeditor.h b/kaddressbook/simpleaddresseeeditor.h index 2ea10a822..fbc5d60d7 100644 --- a/kaddressbook/simpleaddresseeeditor.h +++ b/kaddressbook/simpleaddresseeeditor.h @@ -34,7 +34,7 @@ class SimpleAddresseeEditor : public AddresseeEditorBase Q_OBJECT TQ_OBJECT public: - SimpleAddresseeEditor( TQWidget *tqparent, const char *name = 0 ); + SimpleAddresseeEditor( TQWidget *parent, const char *name = 0 ); ~SimpleAddresseeEditor(); void setAddressee( const KABC::Addressee& ); diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index bb0956363..e50e129ba 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -39,8 +39,8 @@ #include "soundwidget.h" -SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false ) +SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h index 66fb74779..c589ec5bb 100644 --- a/kaddressbook/soundwidget.h +++ b/kaddressbook/soundwidget.h @@ -39,7 +39,7 @@ class SoundWidget : public KAB::ContactEditorWidget TQ_OBJECT public: - SoundWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~SoundWidget(); void loadContact( KABC::Addressee *addr ); @@ -65,9 +65,9 @@ class SoundWidget : public KAB::ContactEditorWidget class SoundWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) { - return new SoundWidget( ab, tqparent, name ); + return new SoundWidget( ab, parent, name ); } TQString pageIdentifier() const { return "misc"; } diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h index 29266fa82..2ff6591c7 100644 --- a/kaddressbook/typecombo.h +++ b/kaddressbook/typecombo.h @@ -37,7 +37,7 @@ class TypeCombo : public KComboBox typedef typename T::List List; typedef typename T::List::Iterator Iterator; - TypeCombo( List &list, TQWidget *tqparent, const char *name = 0 ); + TypeCombo( List &list, TQWidget *parent, const char *name = 0 ); void setLineEdit( TQLineEdit *edit ) { mLineEdit = edit; } TQLineEdit *lineEdit() const { return mLineEdit; } @@ -62,9 +62,9 @@ class TypeCombo : public KComboBox }; template <class T> -TypeCombo<T>::TypeCombo( TypeCombo::List &list, TQWidget *tqparent, +TypeCombo<T>::TypeCombo( TypeCombo::List &list, TQWidget *parent, const char *name ) - : KComboBox( tqparent, name ), + : KComboBox( parent, name ), mTypeList( list ) { } diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index 7951bc770..9ab4b26e2 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -39,11 +39,11 @@ class FieldItem : public TQListBoxText { public: - FieldItem( TQListBox *tqparent, KABC::Field *field ) - : TQListBoxText( tqparent, field->label() ), mField( field ) {} + FieldItem( TQListBox *parent, KABC::Field *field ) + : TQListBoxText( parent, field->label() ), mField( field ) {} - FieldItem( TQListBox *tqparent, KABC::Field *field, int index ) - : TQListBoxText( tqparent, field->label(), tqparent->item( index ) ), + FieldItem( TQListBox *parent, KABC::Field *field, int index ) + : TQListBoxText( parent, field->label(), parent->item( index ) ), mField( field ) {} KABC::Field *field() { return mField; } @@ -54,9 +54,9 @@ class FieldItem : public TQListBoxText ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab, - TQWidget *tqparent, + TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ), mAddressBook( ab ) + : TQWidget( parent, name ), mAddressBook( ab ) { initGUI(); } diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h index 991a7e1c7..3eac607e2 100644 --- a/kaddressbook/viewconfigurefieldspage.h +++ b/kaddressbook/viewconfigurefieldspage.h @@ -41,7 +41,7 @@ class ViewConfigureFieldsPage : public TQWidget TQ_OBJECT public: - ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *tqparent = 0, + ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0, const char *name = 0 ); void restoreSettings( KConfig* ); diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index fe9cf4418..83c358f3e 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -34,9 +34,9 @@ #include "viewconfigurefilterpage.h" #include "filter.h" -ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *tqparent, +ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h index 4459a1cea..104db3ed4 100644 --- a/kaddressbook/viewconfigurefilterpage.h +++ b/kaddressbook/viewconfigurefilterpage.h @@ -37,7 +37,7 @@ class ViewConfigureFilterPage : public TQWidget TQ_OBJECT public: - ViewConfigureFilterPage( TQWidget *tqparent, const char *name = 0 ); + ViewConfigureFilterPage( TQWidget *parent, const char *name = 0 ); ~ViewConfigureFilterPage(); void restoreSettings( KConfig* ); diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index 1045988c2..efefbd818 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/kaddressbook/viewconfigurewidget.cpp @@ -37,9 +37,9 @@ #include "viewconfigurewidget.h" -ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, +ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::ConfigureWidget( ab, tqparent, name ) + : KAB::ConfigureWidget( ab, parent, name ) { TQVBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -85,9 +85,9 @@ TQVBox *ViewConfigureWidget::addPage( const TQString &item, const TQString &head } ViewConfigureDialog::ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) : KDialogBase( Swallow, i18n( "Modify View: " ) + viewName, Help | Ok | Cancel, - Ok, tqparent, name, true, true ), mConfigWidget( wdg ) + Ok, parent, name, true, true ), mConfigWidget( wdg ) { setMainWidget( mConfigWidget ); diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h index 7abcf22f4..63ed11167 100644 --- a/kaddressbook/viewconfigurewidget.h +++ b/kaddressbook/viewconfigurewidget.h @@ -51,7 +51,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget TQ_OBJECT public: - ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); virtual ~ViewConfigureWidget(); /** @@ -92,7 +92,7 @@ class ViewConfigureDialog : public KDialogBase public: ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); ~ViewConfigureDialog(); void restoreSettings( KConfig* ); diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 646fbbae9..c21e4b2cf 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -49,8 +49,8 @@ #include "viewmanager.h" -ViewManager::ViewManager( KAB::Core *core, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mCore( core ), mActiveView( 0 ), +ViewManager::ViewManager( KAB::Core *core, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mCore( core ), mActiveView( 0 ), mFilterSelectionWidget( 0 ) { initGUI(); diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h index 15fd68fdd..d0a133408 100644 --- a/kaddressbook/viewmanager.h +++ b/kaddressbook/viewmanager.h @@ -53,7 +53,7 @@ class ViewManager : public TQWidget TQ_OBJECT public: - ViewManager( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ); + ViewManager( KAB::Core *core, TQWidget *parent, const char *name = 0 ); ~ViewManager(); void restoreSettings(); diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index b790b0c3f..df956398e 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -42,8 +42,8 @@ class CardViewTip : public TQLabel { public: - CardViewTip( TQWidget *tqparent = 0, const char *name = 0 ) - : TQLabel( tqparent, name ) + CardViewTip( TQWidget *parent = 0, const char *name = 0 ) + : TQLabel( parent, name ) { setPalette( TQToolTip::palette() ); setFrameStyle( Panel | Plain ); @@ -192,8 +192,8 @@ class CardViewItemPrivate }; -CardViewItem::CardViewItem( CardView *tqparent, const TQString &caption ) - : d( new CardViewItemPrivate() ), mView( tqparent ) +CardViewItem::CardViewItem( CardView *parent, const TQString &caption ) + : d( new CardViewItemPrivate() ), mView( parent ) { d->mCaption = caption; @@ -569,8 +569,8 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const } -CardView::CardView( TQWidget *tqparent, const char *name ) - : TQScrollView( tqparent, name ), +CardView::CardView( TQWidget *parent, const char *name ) + : TQScrollView( parent, name ), d( new CardViewPrivate() ) { d->mItemList.setAutoDelete( true ); diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index e2229dd2d..e3c29e5a4 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -60,12 +60,12 @@ class CardViewItem /** Constructor. - @param tqparent The CardView that this card should be displayed on. + @param parent The CardView that this card should be displayed on. @param caption The caption of the card. This is the text that will appear at the top of the card. This is also the string that will be used to sort the cards in the view. */ - CardViewItem( CardView *tqparent, const TQString &caption = TQString() ); + CardViewItem( CardView *parent, const TQString &caption = TQString() ); virtual ~CardViewItem(); /** @@ -129,7 +129,7 @@ class CardViewItem bool isSelected() const; /** - Called by the tqparent card view when the mouse has been resting for + Called by the parent card view when the mouse has been resting for a certain amount of time. If the label or value at pos is obscured (trimmed) make the label display the full text. */ @@ -202,12 +202,12 @@ class CardView : public TQScrollView /** Constructor. */ - CardView( TQWidget *tqparent, const char *name ); + CardView( TQWidget *parent, const char *name ); virtual ~CardView(); /** Inserts the item into the card view. This method does not have - to be called if you created the item with a proper tqparent. Once + to be called if you created the item with a proper parent. Once inserted, the CardView takes ownership of the item. */ void insertItem( CardViewItem *item ); diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp index df190d3c6..a003246f4 100644 --- a/kaddressbook/views/colorlistbox.cpp +++ b/kaddressbook/views/colorlistbox.cpp @@ -25,8 +25,8 @@ #include "colorlistbox.h" -ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f ) - :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1) +ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) + :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) { connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); setAcceptDrops( true); diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h index 566ec8b0a..acccd0b00 100644 --- a/kaddressbook/views/colorlistbox.h +++ b/kaddressbook/views/colorlistbox.h @@ -29,7 +29,7 @@ class ColorListBox : public KListBox TQ_OBJECT public: - ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 ); + ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 ); void setColor( uint index, const TQColor &color ); TQColor color( uint index ) const; diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 846be3898..8cacbfec6 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -47,9 +47,9 @@ ///////////////////////////////// // ConfigureCardViewDialog -ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, +ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : ViewConfigureWidget( ab, tqparent, name ) + : ViewConfigureWidget( ab, parent, name ) { TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(), DesktopIcon( "looknfeel" ) ); @@ -76,8 +76,8 @@ void ConfigureCardViewWidget::saveSettings( KConfig *config ) //////////////////////// // CardViewLookNFeelPage -CardViewLookNFeelPage::CardViewLookNFeelPage( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ) +CardViewLookNFeelPage::CardViewLookNFeelPage( TQWidget *parent, const char *name ) + : TQVBox( parent, name ) { initGUI(); } diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h index 52ec9cbbe..40ddfe4fa 100644 --- a/kaddressbook/views/configurecardviewdialog.h +++ b/kaddressbook/views/configurecardviewdialog.h @@ -48,7 +48,7 @@ class CardViewLookAndFeelPage; class ConfigureCardViewWidget : public ViewConfigureWidget { public: - ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ); + ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ); virtual ~ConfigureCardViewWidget(); virtual void restoreSettings( KConfig* ); @@ -83,7 +83,7 @@ class CardViewLookNFeelPage : public TQVBox { TQ_OBJECT public: - CardViewLookNFeelPage( TQWidget *tqparent=0, const char *name=0 ); + CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 ); ~CardViewLookNFeelPage(); void restoreSettings( KConfig* ); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 179a819a9..b5fb9ded2 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -41,9 +41,9 @@ #include "configuretableviewdialog.h" ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab, - TQWidget *tqparent, + TQWidget *parent, const char *name ) - : ViewConfigureWidget( ab, tqparent, name ) + : ViewConfigureWidget( ab, parent, name ) { TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(), KGlobal::iconLoader()->loadIcon( "looknfeel", @@ -72,8 +72,8 @@ void ConfigureTableViewWidget::saveSettings( KConfig *config ) -LookAndFeelPage::LookAndFeelPage(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +LookAndFeelPage::LookAndFeelPage(TQWidget *parent, const char *name) + : TQWidget(parent, name) { initGUI(); diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h index a0228cba6..3533ae0d3 100644 --- a/kaddressbook/views/configuretableviewdialog.h +++ b/kaddressbook/views/configuretableviewdialog.h @@ -45,7 +45,7 @@ class LookAndFeelPage; class ConfigureTableViewWidget : public ViewConfigureWidget { public: - ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ); + ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ); virtual ~ConfigureTableViewWidget(); virtual void restoreSettings( KConfig* ); @@ -66,7 +66,7 @@ class LookAndFeelPage : public TQWidget TQ_OBJECT public: - LookAndFeelPage( TQWidget *tqparent, const char *name = 0 ); + LookAndFeelPage( TQWidget *parent, const char *name = 0 ); ~LookAndFeelPage() {} void restoreSettings( KConfig* ); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index eab88e2e3..47a1e86e1 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -47,8 +47,8 @@ ///////////////////////////////// // DynamicTip Methods -DynamicTip::DynamicTip( ContactListView *tqparent) - : TQToolTip( tqparent ) +DynamicTip::DynamicTip( ContactListView *parent) + : TQToolTip( parent ) { } @@ -147,12 +147,12 @@ void DynamicTip::maybeTip( const TQPoint &pos ) // ContactListViewItem Methods ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, - ContactListView *tqparent, + ContactListView *parent, KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy ) - : KListViewItem(tqparent), mAddressee(a), mFields( fields ), - parentListView( tqparent ), mDocument(doc), mIMProxy( proxy ) + : KListViewItem(parent), mAddressee(a), mFields( fields ), + parentListView( parent ), mDocument(doc), mIMProxy( proxy ) { if ( mIMProxy ) mHasIM = mIMProxy->isPresent( mAddressee.uid() ); @@ -208,7 +208,7 @@ void ContactListViewItem::paintCell(TQPainter * p, } -ContactListView *ContactListViewItem::tqparent() +ContactListView *ContactListViewItem::parent() { return parentListView; } @@ -258,9 +258,9 @@ void ContactListViewItem::setHasIM( bool hasIM ) ContactListView::ContactListView(KAddressBookTableView *view, KABC::AddressBook* /* doc */, - TQWidget *tqparent, + TQWidget *parent, const char *name ) - : KListView( tqparent, name ), + : KListView( parent, name ), pabWidget( view ), oldColumn( 0 ) { diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index 5492b9161..96966d5ca 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -44,7 +44,7 @@ class KIMProxy; class DynamicTip : public TQToolTip { public: - DynamicTip( ContactListView * tqparent ); + DynamicTip( ContactListView * parent ); protected: void maybeTip( const TQPoint & ); @@ -56,11 +56,11 @@ class ContactListViewItem : public KListViewItem { public: - ContactListViewItem(const KABC::Addressee &a, ContactListView* tqparent, + ContactListViewItem(const KABC::Addressee &a, ContactListView* parent, KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy ); const KABC::Addressee &addressee() const { return mAddressee; } virtual void refresh(); - virtual ContactListView* tqparent(); + virtual ContactListView* parent(); virtual TQString key ( int, bool ) const; void setHasIM( bool hasIM ); /** Adds the border around the cell if the user wants it. @@ -90,7 +90,7 @@ class ContactListView : public KListView public: ContactListView(KAddressBookTableView *view, KABC::AddressBook *doc, - TQWidget *tqparent, + TQWidget *parent, const char *name = 0L ); virtual ~ContactListView() {} //void resort(); diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 1c7f2806d..211b62dd4 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -43,19 +43,19 @@ class CardViewFactory : public ViewFactory { public: - KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name ) + KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name ) { - return new KAddressBookCardView( core, tqparent, name ); + return new KAddressBookCardView( core, parent, name ); } TQString type() const { return I18N_NOOP("Card"); } TQString description() const { return i18n( "Rolodex style cards represent contacts." ); } - ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *tqparent, + ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ) { - return new ConfigureCardViewWidget( ab, tqparent, name ); + return new ConfigureCardViewWidget( ab, parent, name ); } }; @@ -72,8 +72,8 @@ class AddresseeCardViewItem : public CardViewItem AddresseeCardViewItem( const KABC::Field::List &fields, bool showEmptyFields, KABC::AddressBook *doc, const KABC::Addressee &addr, - CardView *tqparent ) - : CardViewItem( tqparent, addr.realName() ), + CardView *parent ) + : CardViewItem( parent, addr.realName() ), mFields( fields ), mShowEmptyFields( showEmptyFields ), mDocument( doc ), mAddressee( addr ) { @@ -116,8 +116,8 @@ class AddresseeCardViewItem : public CardViewItem }; -AddresseeCardView::AddresseeCardView( TQWidget *tqparent, const char *name ) - : CardView( tqparent, name ) +AddresseeCardView::AddresseeCardView( TQWidget *parent, const char *name ) + : CardView( parent, name ) { setAcceptDrops( true ); } @@ -144,8 +144,8 @@ void AddresseeCardView::startDrag() KAddressBookCardView::KAddressBookCardView( KAB::Core *core, - TQWidget *tqparent, const char *name ) - : KAddressBookView( core, tqparent, name ) + TQWidget *parent, const char *name ) + : KAddressBookView( core, parent, name ) { mShowEmptyFields = false; diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h index 9ccc8a40e..128b146a9 100644 --- a/kaddressbook/views/kaddressbookcardview.h +++ b/kaddressbook/views/kaddressbookcardview.h @@ -46,7 +46,7 @@ class KAddressBookCardView : public KAddressBookView TQ_OBJECT public: - KAddressBookCardView( KAB::Core *core, TQWidget *tqparent, + KAddressBookCardView( KAB::Core *core, TQWidget *parent, const char *name = 0 ); virtual ~KAddressBookCardView(); @@ -80,7 +80,7 @@ class AddresseeCardView : public CardView Q_OBJECT TQ_OBJECT public: - AddresseeCardView( TQWidget *tqparent, const char *name = 0 ); + AddresseeCardView( TQWidget *parent, const char *name = 0 ); ~AddresseeCardView(); signals: diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 16fe5cad0..b99bca85c 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -42,9 +42,9 @@ class IconViewFactory : public ViewFactory { public: - KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name ) + KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name ) { - return new KAddressBookIconView( core, tqparent, name ); + return new KAddressBookIconView( core, parent, name ); } TQString type() const { return I18N_NOOP( "Icon" ); } @@ -59,8 +59,8 @@ extern "C" { } } -AddresseeIconView::AddresseeIconView( TQWidget *tqparent, const char *name ) - : KIconView( tqparent, name ) +AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name ) + : KIconView( parent, name ) { setSelectionMode( TQIconView::Extended ); setResizeMode( TQIconView::Adjust ); @@ -96,8 +96,8 @@ class AddresseeIconViewItem : public KIconViewItem { public: AddresseeIconViewItem( const KABC::Field::List&, KABC::AddressBook *doc, - const KABC::Addressee &addr, TQIconView *tqparent ) - : KIconViewItem( tqparent ), mDocument( doc ), mAddressee( addr ) + const KABC::Addressee &addr, TQIconView *parent ) + : KIconViewItem( parent ), mDocument( doc ), mAddressee( addr ) { refresh(); } @@ -136,8 +136,8 @@ class AddresseeIconViewItem : public KIconViewItem KAddressBookIconView::KAddressBookIconView( KAB::Core *core, - TQWidget *tqparent, const char *name) - : KAddressBookView( core, tqparent, name ) + TQWidget *parent, const char *name) + : KAddressBookView( core, parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() ); diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h index 5b9c8c7cc..614920c28 100644 --- a/kaddressbook/views/kaddressbookiconview.h +++ b/kaddressbook/views/kaddressbookiconview.h @@ -45,7 +45,7 @@ class KAddressBookIconView : public KAddressBookView TQ_OBJECT public: - KAddressBookIconView( KAB::Core *core, TQWidget *tqparent, + KAddressBookIconView( KAB::Core *core, TQWidget *parent, const char *name = 0 ); virtual ~KAddressBookIconView(); @@ -79,7 +79,7 @@ class AddresseeIconView : public KIconView TQ_OBJECT public: - AddresseeIconView( TQWidget *tqparent, const char *name = 0 ); + AddresseeIconView( TQWidget *parent, const char *name = 0 ); ~AddresseeIconView(); signals: diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 65bcd36cf..19364d597 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -61,9 +61,9 @@ class TableViewFactory : public ViewFactory { public: - KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name ) + KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name ) { - return new KAddressBookTableView( core, tqparent, name ); + return new KAddressBookTableView( core, parent, name ); } TQString type() const { return I18N_NOOP( "Table" ); } @@ -71,10 +71,10 @@ class TableViewFactory : public ViewFactory TQString description() const { return i18n( "A listing of contacts in a table. Each cell of " "the table holds a field of the contact." ); } - ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *tqparent, + ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ) { - return new ConfigureTableViewWidget( ab, tqparent, name ); + return new ConfigureTableViewWidget( ab, parent, name ); } }; @@ -86,8 +86,8 @@ extern "C" { } KAddressBookTableView::KAddressBookTableView( KAB::Core *core, - TQWidget *tqparent, const char *name ) - : KAddressBookView( core, tqparent, name ) + TQWidget *parent, const char *name ) + : KAddressBookView( core, parent, name ) { mMainLayout = new TQVBoxLayout( viewWidget(), 2 ); diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h index f212829f3..5c9a75105 100644 --- a/kaddressbook/views/kaddressbooktableview.h +++ b/kaddressbook/views/kaddressbooktableview.h @@ -65,7 +65,7 @@ friend class ContactListView; TQ_OBJECT public: - KAddressBookTableView( KAB::Core *core, TQWidget *tqparent, + KAddressBookTableView( KAB::Core *core, TQWidget *parent, const char *name = 0 ); virtual ~KAddressBookTableView(); diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp index 0b7c3dc7c..83cdd2b70 100644 --- a/kaddressbook/xxport/bookmark_xxport.cpp +++ b/kaddressbook/xxport/bookmark_xxport.cpp @@ -33,8 +33,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_bookmark_xxport, BookmarkXXPort ) -BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { createExportAction( i18n( "Export Bookmarks Menu..." ) ); } diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h index 09d95f910..85fd602b4 100644 --- a/kaddressbook/xxport/bookmark_xxport.h +++ b/kaddressbook/xxport/bookmark_xxport.h @@ -33,7 +33,7 @@ class BookmarkXXPort : public KAB::XXPort TQ_OBJECT public: - BookmarkXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "bookmark"; } diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index aa2d76539..22f6afadb 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -36,8 +36,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_csv_xxport, CSVXXPort ) -CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import CSV List..." ) ); createExportAction( i18n( "Export CSV List..." ) ); diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h index a55f326b5..f08fa93d6 100644 --- a/kaddressbook/xxport/csv_xxport.h +++ b/kaddressbook/xxport/csv_xxport.h @@ -32,7 +32,7 @@ class CSVXXPort : public KAB::XXPort TQ_OBJECT public: - CSVXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "csv"; } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 9e2b8d6f6..88a2c087a 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -50,10 +50,10 @@ enum { Local = 0, Guess = 1, Latin1 = 2, Uni = 3, MSBug = 4, Codec = 5 }; -CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *tqparent, +CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent, const char * name ) : KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 | - User2, Ok, tqparent, name, true, true ), + User2, Ok, parent, name, true, true ), mAdjustRows( false ), mStartLine( 0 ), mTextQuote( '"' ), diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h index f3c953ba5..95fd8a486 100644 --- a/kaddressbook/xxport/csvimportdialog.h +++ b/kaddressbook/xxport/csvimportdialog.h @@ -44,7 +44,7 @@ class CSVImportDialog : public KDialogBase TQ_OBJECT public: - CSVImportDialog( KABC::AddressBook *ab, TQWidget *tqparent, + CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~CSVImportDialog(); diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp index bed374339..402665ab1 100644 --- a/kaddressbook/xxport/eudora_xxport.cpp +++ b/kaddressbook/xxport/eudora_xxport.cpp @@ -38,8 +38,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_eudora_xxport, EudoraXXPort ) -EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import Eudora Addressbook..." ) ); } diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h index de2b47845..59937fcb1 100644 --- a/kaddressbook/xxport/eudora_xxport.h +++ b/kaddressbook/xxport/eudora_xxport.h @@ -32,7 +32,7 @@ class EudoraXXPort : public KAB::XXPort TQ_OBJECT public: - EudoraXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "eudora"; } diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index 2d18cef7c..abd3234b7 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -77,8 +77,8 @@ static KProgressDialog *m_progressDlg; K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_gnokii_xxport, GNOKIIXXPort ) -GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { this_filter = this; m_progressDlg = NULL; @@ -823,7 +823,7 @@ static TQString businit(void) return i18n("Gnokii is not yet configured."); // uncomment to debug all gnokii communication on stderr. - // gn_log_debug_tqmask = GN_LOG_T_STDERR; + // gn_log_debug_mask = GN_LOG_T_STDERR; gn_data_clear(&data); diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h index a78ca2335..6b5361c8b 100644 --- a/kaddressbook/xxport/gnokii_xxport.h +++ b/kaddressbook/xxport/gnokii_xxport.h @@ -32,7 +32,7 @@ class GNOKIIXXPort : public KAB::XXPort TQ_OBJECT public: - GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "gnokii"; } diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 08fe4a108..3b60ca5e1 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -39,8 +39,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_kde2_xxport, KDE2XXPort ) -KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import KDE 2 Addressbook..." ) ); } diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h index 895a09a43..dc0675248 100644 --- a/kaddressbook/xxport/kde2_xxport.h +++ b/kaddressbook/xxport/kde2_xxport.h @@ -32,7 +32,7 @@ class KDE2XXPort : public KAB::XXPort TQ_OBJECT public: - KDE2XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "kde2"; } diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index 8ff5cf44d..a51169e7d 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -50,8 +50,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_ldif_xxport, LDIFXXPort ) -LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import LDIF Addressbook..." ) ); createExportAction( i18n( "Export LDIF Addressbook..." ) ); diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h index 2d1e9e04e..167f44305 100644 --- a/kaddressbook/xxport/ldif_xxport.h +++ b/kaddressbook/xxport/ldif_xxport.h @@ -33,7 +33,7 @@ class LDIFXXPort : public KAB::XXPort TQ_OBJECT public: - LDIFXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "ldif"; } diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 593960e83..4c2949cc9 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -38,8 +38,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_opera_xxport, OperaXXPort ) -OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import Opera Addressbook..." ) ); } diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h index b33c91521..2395f5a26 100644 --- a/kaddressbook/xxport/opera_xxport.h +++ b/kaddressbook/xxport/opera_xxport.h @@ -33,7 +33,7 @@ class OperaXXPort : public KAB::XXPort TQ_OBJECT public: - OperaXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "opera"; } diff --git a/kaddressbook/xxport/pab_mapihd.cpp b/kaddressbook/xxport/pab_mapihd.cpp index b1ab4e5f4..6d61cb339 100644 --- a/kaddressbook/xxport/pab_mapihd.cpp +++ b/kaddressbook/xxport/pab_mapihd.cpp @@ -151,7 +151,7 @@ pabrec_entry e=pr_unknown; return e; } -pabfields_t::pabfields_t(pabrec & R, TQWidget * /*tqparent*/) +pabfields_t::pabfields_t(pabrec & R, TQWidget * /*parent*/) { // Skip the first two words, because they're always the // same 000c 0014 ==> 0014 gives us the types, so we diff --git a/kaddressbook/xxport/pab_mapihd.h b/kaddressbook/xxport/pab_mapihd.h index 7db97873a..c54be4500 100644 --- a/kaddressbook/xxport/pab_mapihd.h +++ b/kaddressbook/xxport/pab_mapihd.h @@ -105,7 +105,7 @@ word_t literal(int k); content_t order(int k); public: - pabfields_t(pabrec & R, TQWidget *tqparent); + pabfields_t(pabrec & R, TQWidget *parent); public: KABC::Addressee get( ); bool isOK(void) { return OK; } diff --git a/kaddressbook/xxport/pab_pablib.h b/kaddressbook/xxport/pab_pablib.h index 13f2b7200..c26cbdf23 100644 --- a/kaddressbook/xxport/pab_pablib.h +++ b/kaddressbook/xxport/pab_pablib.h @@ -36,7 +36,7 @@ class pab TQFile in; const char *pabfile; TQString cap; - TQWidget *tqparent; + TQWidget *parent; public: pab(const char *pabFile); ~pab(); diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 8075a7da2..021f671c8 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -40,8 +40,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_pab_xxport, PABXXPort ) -PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { createImportAction( i18n("Import MS Exchange Personal Address Book (.PAB)") ); } diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h index 70eef1a3f..c0450df65 100644 --- a/kaddressbook/xxport/pab_xxport.h +++ b/kaddressbook/xxport/pab_xxport.h @@ -33,7 +33,7 @@ class PABXXPort : public KAB::XXPort TQ_OBJECT public: - PABXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "pab"; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 9dedae791..2d4da849b 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -56,7 +56,7 @@ class VCardViewerDialog : public KDialogBase { public: VCardViewerDialog( const KABC::Addressee::List &list, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); KABC::Addressee::List contacts() const; @@ -78,7 +78,7 @@ class VCardViewerDialog : public KDialogBase class VCardExportSelectionDialog : public KDialogBase { public: - VCardExportSelectionDialog( TQWidget *tqparent, const char *name = 0 ); + VCardExportSelectionDialog( TQWidget *parent, const char *name = 0 ); ~VCardExportSelectionDialog(); bool exportPrivateFields() const; @@ -93,8 +93,8 @@ class VCardExportSelectionDialog : public KDialogBase TQCheckBox *mEncryptionKeys; }; -VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import vCard..." ) ); createExportAction( i18n( "Export vCard 2.1..." ), "v21" ); @@ -465,9 +465,9 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type ) // ---------- VCardViewer Dialog ---------------- // VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Import vCard" ), Yes | No | Apply | Cancel, Yes, - tqparent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ), + parent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ), mContacts( list ) { TQFrame *page = plainPage(); @@ -537,10 +537,10 @@ void VCardViewerDialog::slotCancel() // ---------- VCardExportSelection Dialog ---------------- // -VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *tqparent, +VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Select vCard Fields" ), Ok | Cancel, Ok, - tqparent, name, true, true ) + parent, name, true, true ) { TQFrame *page = plainPage(); diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h index e051d53ff..44374432c 100644 --- a/kaddressbook/xxport/vcard_xxport.h +++ b/kaddressbook/xxport/vcard_xxport.h @@ -33,7 +33,7 @@ class VCardXXPort : public KAB::XXPort TQ_OBJECT public: - VCardXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "vcard"; } diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 8eabc81c0..642f8bfe3 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -41,8 +41,8 @@ KURL XXPortManager::importURL = KURL(); TQString XXPortManager::importData = TQString(); -XXPortManager::XXPortManager( KAB::Core *core, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), mCore( core ) +XXPortManager::XXPortManager( KAB::Core *core, TQObject *parent, const char *name ) + : TQObject( parent, name ), mCore( core ) { loadPlugins(); } diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h index fb179d6eb..116326617 100644 --- a/kaddressbook/xxportmanager.h +++ b/kaddressbook/xxportmanager.h @@ -43,7 +43,7 @@ class KDE_EXPORT XXPortManager : public TQObject TQ_OBJECT public: - XXPortManager( KAB::Core *core, TQObject *tqparent, const char *name = 0 ); + XXPortManager( KAB::Core *core, TQObject *parent, const char *name = 0 ); ~XXPortManager(); void restoreSettings(); diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index c90de6ca3..b932f9d97 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -44,9 +44,9 @@ #include "xxportselectdialog.h" XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort, - TQWidget* tqparent, const char* name ) + TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n( "Choose Which Contacts to Export" ), Help | Ok | Cancel, - Ok, tqparent, name, true, true ), mCore( core ), + Ok, parent, name, true, true ), mCore( core ), mUseSorting( sort ) { initGUI(); diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h index 10c311b12..3e535926f 100644 --- a/kaddressbook/xxportselectdialog.h +++ b/kaddressbook/xxportselectdialog.h @@ -48,7 +48,7 @@ class XXPortSelectDialog : public KDialogBase TQ_OBJECT public: - XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* tqparent, + XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* parent, const char* name = 0 ); KABC::AddresseeList contacts(); diff --git a/kalarm/Changelog b/kalarm/Changelog index 90b5b05bb..2671941a5 100644 --- a/kalarm/Changelog +++ b/kalarm/Changelog @@ -640,7 +640,7 @@ KAlarm Change Log - Add dialog option to set an alarm's time as an interval from the current time. - Add defer option to alarm message window. - Provide button in alarm message window to activate KAlarm. -- Make dialogs modal only for their tqparent window. +- Make dialogs modal only for their parent window. === Version 0.2 --- 20 October 2001 === - Implement repeating alarms. diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 7bdd767a6..85bc17392 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -439,14 +439,14 @@ void AlarmCalendar::close() /****************************************************************************** * Import alarms from an external calendar and merge them into KAlarm's calendar. * The alarms are given new unique event IDs. -* Parameters: tqparent = tqparent widget for error message boxes +* Parameters: parent = parent widget for error message boxes * Reply = true if all alarms in the calendar were successfully imported * = false if any alarms failed to be imported. */ -bool AlarmCalendar::importAlarms(TQWidget* tqparent) +bool AlarmCalendar::importAlarms(TQWidget* parent) { KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"), - TQString::tqfromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), tqparent); + TQString::tqfromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), parent); if (url.isEmpty()) { kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl; @@ -468,7 +468,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent) if (!KStandardDirs::exists(filename)) { kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl; - KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL())); + KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL())); return false; } } @@ -477,7 +477,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent) if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl; - KMessageBox::error(tqparent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL())); + KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL())); return false; } kdDebug(5950) << "--- Downloaded to " << filename << endl; @@ -490,7 +490,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent) if (!success) { kdDebug(5950) << "AlarmCalendar::importAlarms(): error loading calendar '" << filename << "'" << endl; - KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL())); + KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL())); } else { diff --git a/kalarm/alarmevent.h b/kalarm/alarmevent.h index 75ff7cbef..b5bc41e2e 100644 --- a/kalarm/alarmevent.h +++ b/kalarm/alarmevent.h @@ -153,7 +153,7 @@ class KAAlarm : public KAAlarmEventBase { INVALID_ALARM = 0, // not an alarm MAIN_ALARM = 1, // THE real alarm. Must be the first in the enumeration. - // The following values may be used in combination as a bitqmask 0x0E + // The following values may be used in combination as a bimask 0x0E REMINDER_ALARM = 0x02, // reminder in advance of main alarm DEFERRED_ALARM = 0x04, // deferred alarm DEFERRED_REMINDER_ALARM = REMINDER_ALARM | DEFERRED_ALARM, // deferred early warning @@ -170,7 +170,7 @@ class KAAlarm : public KAAlarmEventBase { INVALID__ALARM = INVALID_ALARM, MAIN__ALARM = MAIN_ALARM, - // The following values may be used in combination as a bitqmask 0x0E + // The following values may be used in combination as a bimask 0x0E REMINDER__ALARM = REMINDER_ALARM, TIMED_DEFERRAL_FLAG = 0x08, // deferral has a time; if clear, it is date-only DEFERRED_DATE__ALARM = DEFERRED_ALARM, // deferred alarm - date-only @@ -263,7 +263,7 @@ class KAEvent : public KAAlarmEventBase DATE_DEFERRAL = DEFERRAL, TIME_DEFERRAL = DEFERRAL | TIMED_FLAG, DISPLAYING_ = 0x80000, - READ_ONLY_FLAGS = 0xF0000 // tqmask for all read-only internal values + READ_ONLY_FLAGS = 0xF0000 // mask for all read-only internal values }; /** The category of an event, indicated by the middle part of its UID. */ enum tqStatus @@ -288,7 +288,7 @@ class KAEvent : public KAAlarmEventBase RECURRENCE_DATE = 0x02, // a recurrence with only a date, not a time RECURRENCE_DATE_TIME = 0x03, // a recurrence with a date and time LAST_RECURRENCE = 0x04, // the last recurrence - OCCURRENCE_REPEAT = 0x10, // (bitqmask for a repetition of an occurrence) + OCCURRENCE_REPEAT = 0x10, // (bimask for a repetition of an occurrence) FIRST_OR_ONLY_OCCURRENCE_REPEAT = OCCURRENCE_REPEAT | FIRST_OR_ONLY_OCCURRENCE, // a repetition of the first occurrence RECURRENCE_DATE_REPEAT = OCCURRENCE_REPEAT | RECURRENCE_DATE, // a repetition of a date-only recurrence RECURRENCE_DATE_TIME_REPEAT = OCCURRENCE_REPEAT | RECURRENCE_DATE_TIME, // a repetition of a date/time recurrence diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 546752ea2..355cc4e3e 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -44,7 +44,7 @@ class AlarmListTooltip : public TQToolTip { public: - AlarmListTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { } + AlarmListTooltip(TQWidget* parent) : TQToolTip(parent) { } virtual ~AlarmListTooltip() {} protected: virtual void maybeTip(const TQPoint&); @@ -59,8 +59,8 @@ TQValueList<EventListViewBase*> AlarmListView::mInstanceList; bool AlarmListView::mDragging = false; -AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* tqparent, const char* name) - : EventListViewBase(tqparent, name), +AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* parent, const char* name) + : EventListViewBase(parent, name), mMousePressed(false), mDrawMessageInColour(false), mShowExpired(false) @@ -414,20 +414,20 @@ void AlarmListView::contentsMouseReleaseEvent(TQMouseEvent *e) int AlarmListViewItem::mTimeHourPos = -2; int AlarmListViewItem::mDigitWidth = -1; -AlarmListViewItem::AlarmListViewItem(AlarmListView* tqparent, const KAEvent& event, const TQDateTime& now) - : EventListViewItemBase(tqparent, event), +AlarmListViewItem::AlarmListViewItem(AlarmListView* parent, const KAEvent& event, const TQDateTime& now) + : EventListViewItemBase(parent, event), mMessageTruncated(false), mTimeToAlarmShown(false) { setLastColumnText(); // set the message column text DateTime dateTime = event.expired() ? event.startDateTime() : event.displayDateTime(); - if (tqparent->column(AlarmListView::TIME_COLUMN) >= 0) - setText(tqparent->column(AlarmListView::TIME_COLUMN), alarmTimeText(dateTime)); - if (tqparent->column(AlarmListView::TIME_TO_COLUMN) >= 0) + if (parent->column(AlarmListView::TIME_COLUMN) >= 0) + setText(parent->column(AlarmListView::TIME_COLUMN), alarmTimeText(dateTime)); + if (parent->column(AlarmListView::TIME_TO_COLUMN) >= 0) { TQString tta = timeToAlarmText(now); - setText(tqparent->column(AlarmListView::TIME_TO_COLUMN), tta); + setText(parent->column(AlarmListView::TIME_TO_COLUMN), tta); mTimeToAlarmShown = !tta.isNull(); } TQTime t = dateTime.time(); @@ -468,7 +468,7 @@ AlarmListViewItem::AlarmListViewItem(AlarmListView* tqparent, const KAEvent& eve break; } } - setText(tqparent->column(AlarmListView::REPEAT_COLUMN), repeatText); + setText(parent->column(AlarmListView::REPEAT_COLUMN), repeatText); mRepeatOrder.sprintf("%c%08d", '0' + repeatOrder, repeatInterval); bool showColour = (event.action() == KAEvent::MESSAGE || event.action() == KAEvent::FILE); diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h index 56b5c5895..f88ea4a85 100644 --- a/kalarm/alarmlistview.h +++ b/kalarm/alarmlistview.h @@ -31,7 +31,7 @@ class AlarmListTooltip; class AlarmListViewItem : public EventListViewItemBase { public: - AlarmListViewItem(AlarmListView* tqparent, const KAEvent&, const TQDateTime& now); + AlarmListViewItem(AlarmListView* parent, const KAEvent&, const TQDateTime& now); TQTime showTimeToAlarm(bool show); void updateTimeToAlarm(const TQDateTime& now, bool forceDisplay = false); virtual void paintCell(TQPainter*, const TQColorGroup&, int column, int width, int align); @@ -71,7 +71,7 @@ class AlarmListView : public EventListViewBase COLUMN_COUNT }; - AlarmListView(const TQValueList<int>& order, TQWidget* tqparent = 0, const char* name = 0); + AlarmListView(const TQValueList<int>& order, TQWidget* parent = 0, const char* name = 0); ~AlarmListView(); void showExpired(bool show) { mShowExpired = show; } bool showingExpired() const { return mShowExpired; } diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index 4443ae2fc..2b907d9a1 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -55,8 +55,8 @@ TQString AlarmTimeWidget::i18n_TimeAfterPeriod() /****************************************************************************** * Construct a widget with a group box and title. */ -AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* tqparent, const char* name) - : ButtonGroup(groupBoxTitle, tqparent, name), +AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent, const char* name) + : ButtonGroup(groupBoxTitle, parent, name), mMinDateTimeIsNow(false), mPastMax(false), mMinMaxTimeSet(false) @@ -67,8 +67,8 @@ AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidg /****************************************************************************** * Construct a widget without a group box or title. */ -AlarmTimeWidget::AlarmTimeWidget(int mode, TQWidget* tqparent, const char* name) - : ButtonGroup(tqparent, name), +AlarmTimeWidget::AlarmTimeWidget(int mode, TQWidget* parent, const char* name) + : ButtonGroup(parent, name), mMinDateTimeIsNow(false), mPastMax(false), mMinMaxTimeSet(false) diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h index 0b8d6d4f1..a4f438578 100644 --- a/kalarm/alarmtimewidget.h +++ b/kalarm/alarmtimewidget.h @@ -41,8 +41,8 @@ class AlarmTimeWidget : public ButtonGroup DEFER_TIME = 0x01, // "Defer to ..." NARROW = 0x02 // make a narrow widget }; - AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* tqparent = 0, const char* name = 0); - AlarmTimeWidget(int mode, TQWidget* tqparent = 0, const char* name = 0); + AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent = 0, const char* name = 0); + AlarmTimeWidget(int mode, TQWidget* parent = 0, const char* name = 0); DateTime getDateTime(int* minsFromNow = 0, bool checkExpired = true, bool showErrorMessage = true, TQWidget** errorWidget = 0) const; void setDateTime(const DateTime&); void setMinDateTimeIsCurrent(); diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 71ab86922..97e7bc6f7 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -58,7 +58,7 @@ class AddresseeItem : public TQListViewItem { public: enum columns { NAME = 0, BIRTHDAY = 1 }; - AddresseeItem(TQListView* tqparent, const TQString& name, const TQDate& birthday); + AddresseeItem(TQListView* parent, const TQString& name, const TQDate& birthday); TQDate birthday() const { return mBirthday; } virtual TQString key(int column, bool ascending) const; private: @@ -70,8 +70,8 @@ class AddresseeItem : public TQListViewItem const KABC::AddressBook* BirthdayDlg::mAddressBook = 0; -BirthdayDlg::BirthdayDlg(TQWidget* tqparent) - : KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, tqparent, "BirthdayDlg"), +BirthdayDlg::BirthdayDlg(TQWidget* parent) + : KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, parent, "BirthdayDlg"), mSpecialActionsButton(0) { TQWidget* topWidget = plainPage(); @@ -396,8 +396,8 @@ void BirthdayDlg::slotTextLostFocus() = Class: AddresseeItem =============================================================================*/ -AddresseeItem::AddresseeItem(TQListView* tqparent, const TQString& name, const TQDate& birthday) - : TQListViewItem(tqparent), +AddresseeItem::AddresseeItem(TQListView* parent, const TQString& name, const TQDate& birthday) + : TQListViewItem(parent), mBirthday(birthday) { setText(NAME, name); @@ -417,8 +417,8 @@ TQString AddresseeItem::key(int column, bool) const = Class: BListView =============================================================================*/ -BListView::BListView(TQWidget* tqparent, const char* name) - : KListView(tqparent, name) +BListView::BListView(TQWidget* parent, const char* name) + : KListView(parent, name) { KAccel* accel = new KAccel(this); accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll())); diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h index 776b5f1bd..1abd4c8a3 100644 --- a/kalarm/birthdaydlg.h +++ b/kalarm/birthdaydlg.h @@ -45,7 +45,7 @@ class BirthdayDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - BirthdayDlg(TQWidget* tqparent = 0); + BirthdayDlg(TQWidget* parent = 0); TQValueList<KAEvent> events() const; static void close(); @@ -82,10 +82,10 @@ class BLineEdit : public TQLineEdit Q_OBJECT TQ_OBJECT public: - BLineEdit(TQWidget* tqparent = 0, const char* name = 0) - : TQLineEdit(tqparent, name) {} - BLineEdit(const TQString& text, TQWidget* tqparent = 0, const char* name = 0) - : TQLineEdit(text, tqparent, name) {} + BLineEdit(TQWidget* parent = 0, const char* name = 0) + : TQLineEdit(parent, name) {} + BLineEdit(const TQString& text, TQWidget* parent = 0, const char* name = 0) + : TQLineEdit(text, parent, name) {} signals: void focusLost(); protected: @@ -97,7 +97,7 @@ class BListView : public KListView Q_OBJECT TQ_OBJECT public: - BListView(TQWidget* tqparent = 0, const char* name = 0); + BListView(TQWidget* parent = 0, const char* name = 0); public slots: virtual void slotSelectAll() { selectAll(true); } virtual void slotDeselect() { selectAll(false); } diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index f7e340f85..70acfa0e5 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -723,8 +723,8 @@ void NotificationHandler::registered(bool reregister, int result, int version) = Class: AlarmEnableAction =============================================================================*/ -AlarmEnableAction::AlarmEnableAction(int accel, TQObject* tqparent, const char* name) - : KToggleAction(i18n("Enable &Alarms"), accel, tqparent, name), +AlarmEnableAction::AlarmEnableAction(int accel, TQObject* parent, const char* name) + : KToggleAction(i18n("Enable &Alarms"), accel, parent, name), mInitialised(false) { setCheckedState(i18n("Disable &Alarms")); diff --git a/kalarm/daemon.h b/kalarm/daemon.h index fff7c7554..df3fdd4d2 100644 --- a/kalarm/daemon.h +++ b/kalarm/daemon.h @@ -122,7 +122,7 @@ class AlarmEnableAction : public KToggleAction Q_OBJECT TQ_OBJECT public: - AlarmEnableAction(int accel, TQObject* tqparent, const char* name = 0); + AlarmEnableAction(int accel, TQObject* parent, const char* name = 0); public slots: void setCheckedActual(bool); // set state and emit switched() signal virtual void setChecked(bool); // request state change and emit userClicked() signal diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp index 4709f6a8f..8c7edd3ce 100644 --- a/kalarm/deferdlg.cpp +++ b/kalarm/deferdlg.cpp @@ -40,8 +40,8 @@ DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT, - bool cancelButton, TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, true, caption, Ok|Cancel|User1, Ok, false, i18n("Cancel &Deferral")) + bool cancelButton, TQWidget* parent, const char* name) + : KDialogBase(parent, name, true, caption, Ok|Cancel|User1, Ok, false, i18n("Cancel &Deferral")) { if (!cancelButton) showButton(User1, false); diff --git a/kalarm/deferdlg.h b/kalarm/deferdlg.h index 4ab2c9cb5..f7a09f47f 100644 --- a/kalarm/deferdlg.h +++ b/kalarm/deferdlg.h @@ -33,7 +33,7 @@ class DeferAlarmDlg : public KDialogBase TQ_OBJECT public: DeferAlarmDlg(const TQString& caption, const DateTime& initialDT, - bool cancelButton, TQWidget* tqparent = 0, const char* name = 0); + bool cancelButton, TQWidget* parent = 0, const char* name = 0); void setLimit(const DateTime&); DateTime setLimit(const TQString& eventID); const DateTime& getDateTime() const { return mAlarmDateTime; } diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index 93b6bc5af..2d722dd99 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -97,8 +97,8 @@ static const int maxDelayTime = 99*60 + 59; // < 100 hours class PickAlarmFileRadio : public PickFileRadio { public: - PickAlarmFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name = 0) - : PickFileRadio(text, tqparent, name) { } + PickAlarmFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = 0) + : PickFileRadio(text, parent, name) { } 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(), @@ -114,8 +114,8 @@ class PickAlarmFileRadio : public PickFileRadio class PickLogFileRadio : public PickFileRadio { public: - PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* tqparent, const char* name = 0) - : PickFileRadio(b, e, text, tqparent, name) { } + PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* parent, const char* name = 0) + : PickFileRadio(b, e, text, parent, name) { } 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(), @@ -165,9 +165,9 @@ TQString EditAlarmDlg::i18n_j_EmailSubject() { return i18n("Email subject", * = false to edit/create an alarm. * event != to initialise the dialogue to show the specified event's data. */ -EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqparent, const char* name, +EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent, const char* name, const KAEvent* event, bool readOnly) - : KDialogBase(tqparent, (name ? name : Template ? "TemplEditDlg" : "EditDlg"), true, caption, + : KDialogBase(parent, (name ? name : Template ? "TemplEditDlg" : "EditDlg"), true, caption, (readOnly ? Cancel|Try : Template ? Ok|Cancel|Try : Ok|Cancel|Try|Default), (readOnly ? Cancel : Ok)), mMainPageShown(false), @@ -414,9 +414,9 @@ EditAlarmDlg::~EditAlarmDlg() /****************************************************************************** * Set up the dialog controls common to display alarms. */ -void EditAlarmDlg::initDisplayAlarms(TQWidget* tqparent) +void EditAlarmDlg::initDisplayAlarms(TQWidget* parent) { - mDisplayAlarmsFrame = new TQFrame(tqparent); + mDisplayAlarmsFrame = new TQFrame(parent); mDisplayAlarmsFrame->setFrameStyle(TQFrame::NoFrame); TQBoxLayout* frameLayout = new TQVBoxLayout(mDisplayAlarmsFrame, 0, spacingHint()); @@ -481,9 +481,9 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* tqparent) /****************************************************************************** * Set up the command alarm dialog controls. */ -void EditAlarmDlg::initCommand(TQWidget* tqparent) +void EditAlarmDlg::initCommand(TQWidget* parent) { - mCommandFrame = new TQFrame(tqparent); + mCommandFrame = new TQFrame(parent); mCommandFrame->setFrameStyle(TQFrame::NoFrame); TQBoxLayout* frameLayout = new TQVBoxLayout(mCommandFrame, 0, spacingHint()); @@ -556,9 +556,9 @@ void EditAlarmDlg::initCommand(TQWidget* tqparent) /****************************************************************************** * Set up the email alarm dialog controls. */ -void EditAlarmDlg::initEmail(TQWidget* tqparent) +void EditAlarmDlg::initEmail(TQWidget* parent) { - mEmailFrame = new TQFrame(tqparent); + mEmailFrame = new TQFrame(parent); mEmailFrame->setFrameStyle(TQFrame::NoFrame); TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint()); TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint()); @@ -972,9 +972,9 @@ void EditAlarmDlg::setAction(KAEvent::Action action, const AlarmText& alarmText) /****************************************************************************** * Create an "acknowledgement confirmation required" checkbox. */ -CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* tqparent, const char* name) +CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* parent, const char* name) { - CheckBox* widget = new CheckBox(i18n_k_ConfirmAck(), tqparent, name); + CheckBox* widget = new CheckBox(i18n_k_ConfirmAck(), parent, name); TQWhatsThis::add(widget, i18n("Check to be prompted for confirmation when you acknowledge the alarm.")); return widget; @@ -2027,8 +2027,8 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const = A text edit field with a minimum height of 3 text lines. = Provides KDE 2 compatibility. =============================================================================*/ -TextEdit::TextEdit(TQWidget* tqparent, const char* name) - : KTextEdit(tqparent, name) +TextEdit::TextEdit(TQWidget* parent, const char* name) + : KTextEdit(parent, name) { TQSize tsize = tqsizeHint(); tsize.setHeight(fontMetrics().lineSpacing()*13/4 + 2*frameWidth()); diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h index 272deaa3a..626ea5d67 100644 --- a/kalarm/editdlg.h +++ b/kalarm/editdlg.h @@ -63,13 +63,13 @@ class EditAlarmDlg : public KDialogBase enum MessageType { MESSAGE, FILE }; enum CmdLogType { DISCARD_OUTPUT, LOG_TO_FILE, EXEC_IN_TERMINAL }; - EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqparent = 0, const char* name = 0, + EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent = 0, const char* name = 0, const KAEvent* = 0, bool readOnly = false); virtual ~EditAlarmDlg(); bool getEvent(KAEvent&); void setAction(KAEvent::Action, const AlarmText& = AlarmText()); - static CheckBox* createConfirmAckCheckbox(TQWidget* tqparent, const char* name = 0); + static CheckBox* createConfirmAckCheckbox(TQWidget* parent, const char* name = 0); static TQString i18n_ConfirmAck(); // plain text of 'Confirm acknowledgement' checkbox static TQString i18n_k_ConfirmAck(); // text of 'Confirm acknowledgement' checkbox, with 'k' shortcut @@ -126,9 +126,9 @@ class EditAlarmDlg : public KDialogBase bool checkCommandData(); bool checkEmailData(); - void initDisplayAlarms(TQWidget* tqparent); - void initCommand(TQWidget* tqparent); - void initEmail(TQWidget* tqparent); + void initDisplayAlarms(TQWidget* parent); + void initCommand(TQWidget* parent); + void initEmail(TQWidget* parent); void saveState(const KAEvent*); bool stateChanged() const; diff --git a/kalarm/editdlgprivate.h b/kalarm/editdlgprivate.h index 6dffba7eb..ec2bc73d1 100644 --- a/kalarm/editdlgprivate.h +++ b/kalarm/editdlgprivate.h @@ -29,7 +29,7 @@ class PageFrame : public TQFrame Q_OBJECT TQ_OBJECT public: - PageFrame(TQWidget* tqparent = 0, const char* name = 0) : TQFrame(tqparent, name) { } + PageFrame(TQWidget* parent = 0, const char* name = 0) : TQFrame(parent, name) { } protected: virtual void showEvent(TQShowEvent*) { emit shown(); } signals: @@ -41,7 +41,7 @@ class TextEdit : public KTextEdit Q_OBJECT TQ_OBJECT public: - TextEdit(TQWidget* tqparent, const char* name = 0); + TextEdit(TQWidget* parent, const char* name = 0); protected: virtual void dragEnterEvent(TQDragEnterEvent*); }; diff --git a/kalarm/emailidcombo.cpp b/kalarm/emailidcombo.cpp index 388fa4573..99f754c89 100644 --- a/kalarm/emailidcombo.cpp +++ b/kalarm/emailidcombo.cpp @@ -21,8 +21,8 @@ #include "emailidcombo.moc" -EmailIdCombo::EmailIdCombo(KPIM::IdentityManager* manager, TQWidget* tqparent, const char* name) - : KPIM::IdentityCombo(manager, tqparent, name), +EmailIdCombo::EmailIdCombo(KPIM::IdentityManager* manager, TQWidget* parent, const char* name) + : KPIM::IdentityCombo(manager, parent, name), mReadOnly(false) { } diff --git a/kalarm/emailidcombo.h b/kalarm/emailidcombo.h index 6e5294d8d..1d2c2785f 100644 --- a/kalarm/emailidcombo.h +++ b/kalarm/emailidcombo.h @@ -30,7 +30,7 @@ class EmailIdCombo : public KPIM::IdentityCombo Q_OBJECT TQ_OBJECT public: - explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* tqparent = 0, const char* name = 0); + explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* parent = 0, const char* name = 0); void setReadOnly(bool ro) { mReadOnly = ro; } protected: virtual void mousePressEvent(TQMouseEvent*); diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp index c463c8ad0..a8f5b4d18 100644 --- a/kalarm/eventlistviewbase.cpp +++ b/kalarm/eventlistviewbase.cpp @@ -45,8 +45,8 @@ class EventListWhatsThisBase : public TQWhatsThis = Base class for displaying a list of events. =============================================================================*/ -EventListViewBase::EventListViewBase(TQWidget* tqparent, const char* name) - : KListView(tqparent, name), +EventListViewBase::EventListViewBase(TQWidget* parent, const char* name) + : KListView(parent, name), mFind(0), mLastColumn(-1), mLastColumnHeaderWidth(0) @@ -392,8 +392,8 @@ TQPixmap* EventListViewItemBase::mEmailIcon; int EventListViewItemBase::mIconWidth = 0; -EventListViewItemBase::EventListViewItemBase(EventListViewBase* tqparent, const KAEvent& event) - : TQListViewItem(tqparent), +EventListViewItemBase::EventListViewItemBase(EventListViewBase* parent, const KAEvent& event) + : TQListViewItem(parent), mEvent(event) { iconWidth(); // load the icons @@ -404,9 +404,9 @@ EventListViewItemBase::EventListViewItemBase(EventListViewBase* tqparent, const */ void EventListViewItemBase::setLastColumnText() { - EventListViewBase* tqparent = (EventListViewBase*)listView(); - setText(tqparent->lastColumn(), lastColumnText()); - mLastColumnWidth = width(tqparent->fontMetrics(), tqparent, tqparent->lastColumn()); + EventListViewBase* parent = (EventListViewBase*)listView(); + setText(parent->lastColumn(), lastColumnText()); + mLastColumnWidth = width(parent->fontMetrics(), parent, parent->lastColumn()); } /****************************************************************************** diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h index 6fe74f4f7..86263a7a9 100644 --- a/kalarm/eventlistviewbase.h +++ b/kalarm/eventlistviewbase.h @@ -42,7 +42,7 @@ class EventListViewBase : public KListView typedef TQValueListIterator<EventListViewBase*> InstanceListIterator; typedef TQValueListConstIterator<EventListViewBase*> InstanceListConstIterator; - EventListViewBase(TQWidget* tqparent = 0, const char* name = 0); + EventListViewBase(TQWidget* parent = 0, const char* name = 0); virtual ~EventListViewBase() { } EventListViewItemBase* getEntry(const TQString& eventID) const; void addEvent(const KAEvent& e) { addEvent(e, instances(), this); } @@ -107,7 +107,7 @@ class EventListViewBase : public KListView class EventListViewItemBase : public TQListViewItem { public: - EventListViewItemBase(EventListViewBase* tqparent, const KAEvent&); + EventListViewItemBase(EventListViewBase* parent, const KAEvent&); const KAEvent& event() const { return mEvent; } TQPixmap* eventIcon() const; int lastColumnWidth() const { return mLastColumnWidth; } diff --git a/kalarm/find.cpp b/kalarm/find.cpp index e3732eaa0..ed302f63b 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -49,9 +49,9 @@ enum { static long FIND_KALARM_OPTIONS = FIND_LIVE | FIND_EXPIRED | FIND_MESSAGE | FIND_FILE | FIND_COMMAND | FIND_EMAIL; -Find::Find(EventListViewBase* tqparent) - : TQObject(tqparent), - mListView(tqparent), +Find::Find(EventListViewBase* parent) + : TQObject(parent), + mListView(parent), mDialog(0), mFind(0), mOptions(0) diff --git a/kalarm/find.h b/kalarm/find.h index f7170a291..c1eff2ad8 100644 --- a/kalarm/find.h +++ b/kalarm/find.h @@ -38,7 +38,7 @@ class Find : public TQObject Q_OBJECT TQ_OBJECT public: - explicit Find(EventListViewBase* tqparent); + explicit Find(EventListViewBase* parent); ~Find(); void display(); void findNext(bool forward) { findNext(forward, true); } @@ -54,7 +54,7 @@ class Find : public TQObject void findNext(bool forward, bool sort, bool checkEnd = false, bool fromCurrent = false); EventListViewItemBase* nextItem(EventListViewItemBase*, bool forward) const; - EventListViewBase* mListView; // tqparent list view + EventListViewBase* mListView; // parent list view TQGuardedPtr<KFindDialog> mDialog; TQCheckBox* mExpired; TQCheckBox* mLive; diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index 3b45dbc49..94497b969 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -38,11 +38,11 @@ #include "fontcolour.moc" -FontColourChooser::FontColourChooser(TQWidget *tqparent, const char *name, +FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, bool onlyFixed, const TQStringList &fontList, const TQString& frameLabel, bool editColours, bool fg, bool defaultFont, int visibleListSize) - : TQWidget(tqparent, name), + : TQWidget(parent, name), mFgColourButton(0), mRemoveColourButton(0), mColourList(Preferences::messageColours()), diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h index b7205602a..c4b3a5517 100644 --- a/kalarm/fontcolour.h +++ b/kalarm/fontcolour.h @@ -37,7 +37,7 @@ class FontColourChooser : public TQWidget Q_OBJECT TQ_OBJECT public: - explicit FontColourChooser(TQWidget* tqparent = 0, const char* name = 0, + explicit FontColourChooser(TQWidget* parent = 0, const char* name = 0, bool onlyFixed = false, const TQStringList& fontList = TQStringList(), const TQString& frameLabel = i18n("Requested font"), diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index ca62d1011..e5dd90b92 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -38,8 +38,8 @@ = Font/colour selection button. =============================================================================*/ -FontColourButton::FontColourButton(TQWidget* tqparent, const char* name) - : TQFrame(tqparent, name), +FontColourButton::FontColourButton(TQWidget* parent, const char* name) + : TQFrame(parent, name), mReadOnly(false) { setFrameStyle(NoFrame); @@ -119,8 +119,8 @@ void FontColourButton::slotButtonPressed() =============================================================================*/ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, const TQFont& font, - bool defaultFont, const TQString& caption, TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false), + bool defaultFont, const TQString& caption, TQWidget* parent, const char* name) + : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false), mReadOnly(false) { TQWidget* page = new TQWidget(this); diff --git a/kalarm/fontcolourbutton.h b/kalarm/fontcolourbutton.h index 55713605d..be9fff6fe 100644 --- a/kalarm/fontcolourbutton.h +++ b/kalarm/fontcolourbutton.h @@ -36,7 +36,7 @@ class FontColourButton : public TQFrame Q_OBJECT TQ_OBJECT public: - FontColourButton(TQWidget* tqparent = 0, const char* name = 0); + FontColourButton(TQWidget* parent = 0, const char* name = 0); void setDefaultFont(); void setFont(const TQFont&); void setBgColour(const TQColor&); @@ -71,7 +71,7 @@ class FontColourDlg : public KDialogBase TQ_OBJECT public: FontColourDlg(const TQColor& bg, const TQColor& fg, const TQFont&, bool defaultFont, - const TQString& caption, TQWidget* tqparent = 0, const char* name = 0); + const TQString& caption, TQWidget* parent = 0, const char* name = 0); bool defaultFont() const { return mDefaultFont; } TQFont font() const { return mFont; } TQColor bgColour() const { return mBgColour; } diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 2c44e161f..d7a6383f2 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -498,7 +498,7 @@ UpdatetqStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool en /****************************************************************************** * Display an error message about an error saving an event. */ -void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError code, int nAlarms) +void displayUpdateError(TQWidget* parent, UpdatetqStatus, UpdateError code, int nAlarms) { TQString errmsg; switch (code) @@ -519,13 +519,13 @@ void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError code, in errmsg = i18n("Error saving alarm template"); break; } - KMessageBox::error(tqparent, errmsg); + KMessageBox::error(parent, errmsg); } /****************************************************************************** * Display an error message corresponding to a specified alarm update error code. */ -void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError code, int nAlarms) +void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms) { TQString errmsg; switch (code) @@ -542,7 +542,7 @@ void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError code, int nAlarm : i18n("Unable to delete alarm from KOrganizer"); break; } - KMessageBox::error(tqparent, errmsg); + KMessageBox::error(parent, errmsg); } /****************************************************************************** @@ -628,16 +628,16 @@ TQValueList<KAEvent> templateList() * Prompt the user to re-enable alarms if they are currently disabled, and if * it's an email alarm, warn if no 'From' email address is configured. */ -void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* event) +void outputAlarmWarnings(TQWidget* parent, const KAEvent* event) { if (event && event->action() == KAEvent::EMAIL && Preferences::emailAddress().isEmpty()) - KMessageBox::information(tqparent, i18n("Please set the 'From' email address...", + KMessageBox::information(parent, i18n("Please set the 'From' email address...", "%1\nPlease set it in the Preferences dialog.").tqarg(KAMail::i18n_NeedFromEmailAddress())); if (!Daemon::monitoringAlarms()) { - if (KMessageBox::warningYesNo(tqparent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"), + if (KMessageBox::warningYesNo(parent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"), TQString(), i18n("Enable"), i18n("Keep Disabled"), TQString::tqfromLatin1("EditEnableAlarms")) == KMessageBox::Yes) @@ -868,12 +868,12 @@ FileType fileType(const TQString& mimetype) * Reply = URL selected. If none is selected, URL.isEmpty() is true. */ TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile, - const TQString& filter, int mode, TQWidget* tqparent, const char* name) + const TQString& filter, int mode, TQWidget* parent, const char* name) { TQString initialDir = !initialFile.isEmpty() ? TQString(initialFile).remove(TQRegExp("/[^/]*$")) : !defaultDir.isEmpty() ? defaultDir : TQDir::homeDirPath(); - KFileDialog fileDlg(initialDir, filter, tqparent, name, true); + KFileDialog fileDlg(initialDir, filter, parent, name, true); fileDlg.setOperationMode(mode & KFile::ExistingOnly ? KFileDialog::Opening : KFileDialog::Saving); fileDlg.setMode(KFile::File | mode); fileDlg.setCaption(caption); diff --git a/kalarm/functions.h b/kalarm/functions.h index 5a6798640..b8a1a51d3 100644 --- a/kalarm/functions.h +++ b/kalarm/functions.h @@ -77,7 +77,7 @@ int getVersionNumber(const TQString& version, TQString* subVersi inline int currentCalendarVersion() { return KAEvent::calVersion(); } inline TQString currentCalendarVersionString() { return KAEvent::calVersionString(); } TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile = TQString(), - const TQString& filter = TQString(), int mode = 0, TQWidget* tqparent = 0, const char* name = 0); + const TQString& filter = TQString(), int mode = 0, TQWidget* parent = 0, const char* name = 0); bool edit(const TQString& eventID); bool editNew(const TQString& templateName = TQString()); /** Create a "New Alarm" KAction */ @@ -88,7 +88,7 @@ TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* * If shell commands are disabled, command alarm templates are omitted. */ TQValueList<KAEvent> templateList(); -void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* = 0); +void outputAlarmWarnings(TQWidget* parent, const KAEvent* = 0); void resetDaemon(); void resetDaemonIfQueued(); // must only be called from KAlarmApp::processQueue() TQString runKMail(bool minimise); @@ -105,8 +105,8 @@ UpdatetqStatus deleteTemplate(const KAEvent&); void deleteDisplayEvent(const TQString& eventID); UpdatetqStatus reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false); UpdatetqStatus enableEvent(KAEvent&, AlarmListView* selectionView, bool enable); -void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError, int nAlarms); -void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError, int nAlarms); +void displayUpdateError(TQWidget* parent, UpdatetqStatus, UpdateError, int nAlarms); +void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError, int nAlarms); TQString stripAccel(const TQString&); diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 775821c5e..8a620afd5 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -788,7 +788,7 @@ void KAlarmApp::quitIf(int exitCode, bool force) MainWindow* mw = mwcount ? MainWindow::firstWindow() : 0; if (mwcount > 1 || mwcount && (!mw->isHidden() || !mw->isTrayParent())) return; - // There are no windows left except perhaps a main window which is a hidden tray icon tqparent + // There are no windows left except perhaps a main window which is a hidden tray icon parent if (mTrayWindow) { // There is a system tray icon. @@ -816,11 +816,11 @@ void KAlarmApp::quitIf(int exitCode, bool force) * Closes the system tray window and all main windows, but does not exit the * program if other windows are still open. */ -void KAlarmApp::doQuit(TQWidget* tqparent) +void KAlarmApp::doQuit(TQWidget* parent) { kdDebug(5950) << "KAlarmApp::doQuit()\n"; if (mDisableAlarmsIfStopped - && MessageBox::warningContinueCancel(tqparent, KMessageBox::Cancel, + && MessageBox::warningContinueCancel(parent, KMessageBox::Cancel, i18n("Quitting will disable alarms\n(once any alarm message windows are closed)."), TQString(), KStdGuiItem::quit(), Preferences::TQUIT_WARN ) != KMessageBox::Yes) @@ -973,7 +973,7 @@ void KAlarmApp::removeWindow(TrayWindow*) /****************************************************************************** * Display or close the system tray icon. */ -bool KAlarmApp::displayTrayIcon(bool show, MainWindow* tqparent) +bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent) { static bool creating = false; if (show) @@ -985,10 +985,10 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* tqparent) if (!MainWindow::count() && wantRunInSystemTray()) { creating = true; // prevent main window constructor from creating an additional tray icon - tqparent = MainWindow::create(); + parent = MainWindow::create(); creating = false; } - mTrayWindow = new TrayWindow(tqparent ? tqparent : MainWindow::firstWindow()); + mTrayWindow = new TrayWindow(parent ? parent : MainWindow::firstWindow()); connect(mTrayWindow, TQT_SIGNAL(deleted()), TQT_SIGNAL(trayIconToggled())); mTrayWindow->show(); emit trayIconToggled(); @@ -1917,7 +1917,7 @@ void KAlarmApp::commandErrorMsg(const ShellProcess* proc, const KAEvent& event, /****************************************************************************** * Notes that an informational KMessageBox is displayed for this process. */ -void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* tqparent) +void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* parent) { // Find this command in the command list for (TQValueList<ProcData*>::Iterator it = mCommandProcesses.begin(); it != mCommandProcesses.end(); ++it) @@ -1925,7 +1925,7 @@ void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* tqparent) ProcData* pd = *it; if (pd->process == proc) { - pd->messageBoxParent = tqparent; + pd->messageBoxParent = parent; break; } } diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h index 0aa81b1bf..6653e8101 100644 --- a/kalarm/kalarmapp.h +++ b/kalarm/kalarmapp.h @@ -62,7 +62,7 @@ class KAlarmApp : public KUniqueApplication bool restoreSession(); bool sessionClosingDown() const { return mSessionClosingDown; } void quitIf() { quitIf(0); } - void doQuit(TQWidget* tqparent); + void doQuit(TQWidget* parent); static void displayFatalError(const TQString& message); void addWindow(TrayWindow* w) { mTrayWindow = w; } void removeWindow(TrayWindow*); @@ -77,7 +77,7 @@ class KAlarmApp : public KUniqueApplication void alarmShowing(KAEvent&, KAAlarm::Type, const DateTime&); void alarmCompleted(const KAEvent&); bool deleteEvent(const TQString& eventID) { return handleEvent(eventID, EVENT_CANCEL); } - void commandMessage(ShellProcess*, TQWidget* tqparent); + void commandMessage(ShellProcess*, TQWidget* parent); // Methods called indirectly by the DCOP interface bool scheduleEvent(KAEvent::Action, const TQString& text, const TQDateTime&, int lateCancel, int flags, const TQColor& bg, const TQColor& fg, @@ -160,9 +160,9 @@ class KAlarmApp : public KUniqueApplication static int mFatalError; // a fatal error has occurred - just wait to exit static TQString mFatalMessage; // fatal error message to output bool mInitialised; // initialisation complete: ready to handle DCOP calls - DcopHandler* mDcopHandler; // the tqparent of the main DCOP receiver object + DcopHandler* mDcopHandler; // the parent of the main DCOP receiver object #ifdef OLD_DCOP - DcopHandlerOld* mDcopHandlerOld; // the tqparent of the old main DCOP receiver object + DcopHandlerOld* mDcopHandlerOld; // the parent of the old main DCOP receiver object #endif TrayWindow* mTrayWindow; // active system tray icon TQTime mStartOfDay; // start-of-day time currently in use diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index a8460167f..3bc75205f 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -58,9 +58,9 @@ static const TQString START_OF_DAY(TQString::tqfromLatin1("StartOfDay")); static const TQString AUTOSTART_TRAY(TQString::tqfromLatin1("AutostartTray")); -AlarmDaemon::AlarmDaemon(bool autostart, TQObject *tqparent, const char *name) +AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) : DCOPObject(name), - TQObject(tqparent, name), + TQObject(parent, name), mAlarmTimer(0) { kdDebug(5900) << "AlarmDaemon::AlarmDaemon()" << endl; @@ -373,7 +373,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal) TQValueList<KCal::Event*> eventsDone; for (TQValueList<KCal::Alarm*>::ConstIterator it = alarms.begin(); it != alarms.end(); ++it) { - KCal::Event* event = dynamic_cast<KCal::Event*>((*it)->tqparent()); + KCal::Event* event = dynamic_cast<KCal::Event*>((*it)->parent()); if (!event || eventsDone.find(event) != eventsDone.end()) continue; // either not an event, or the event has already been processed eventsDone += event; diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h index c05a4725c..c2c34e10f 100644 --- a/kalarm/kalarmd/alarmdaemon.h +++ b/kalarm/kalarmd/alarmdaemon.h @@ -34,7 +34,7 @@ class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface Q_OBJECT TQ_OBJECT public: - AlarmDaemon(bool autostart, TQObject* tqparent = 0, const char* name = 0); + AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0); private slots: //#ifdef AUTOSTART_KALARM diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp index 51c127d60..4f69be211 100644 --- a/kalarm/latecancel.cpp +++ b/kalarm/latecancel.cpp @@ -39,8 +39,8 @@ TQString LateCancelSelector::i18n_AutoCloseWinLC() { return i18n("Auto-close TQString LateCancelSelector::i18n_i_AutoCloseWinLC() { return i18n("Auto-close w&indow after late-cancelation time"); } -LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* tqparent, const char* name) - : TQFrame(tqparent, name), +LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name) + : TQFrame(parent, name), mDateOnly(false), mReadOnly(false), mAutoCloseShown(false) diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h index 1d5b53630..ba03d07d7 100644 --- a/kalarm/latecancel.h +++ b/kalarm/latecancel.h @@ -35,7 +35,7 @@ class LateCancelSelector : public TQFrame Q_OBJECT TQ_OBJECT public: - LateCancelSelector(bool allowHourMinute, TQWidget* tqparent, const char* name = 0); + LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name = 0); int minutes() const; void setMinutes(int Minutes, bool dateOnly, TimePeriod::Units defaultUnits); void setDateOnly(bool dateOnly); diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp index b8528316c..018640123 100644 --- a/kalarm/lib/buttongroup.cpp +++ b/kalarm/lib/buttongroup.cpp @@ -26,26 +26,26 @@ #include "buttongroup.moc" -ButtonGroup::ButtonGroup(TQWidget* tqparent, const char* name) - : TQButtonGroup(tqparent, name) +ButtonGroup::ButtonGroup(TQWidget* parent, const char* name) + : TQButtonGroup(parent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } -ButtonGroup::ButtonGroup(const TQString& title, TQWidget* tqparent, const char* name) - : TQButtonGroup(title, tqparent, name) +ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* name) + : TQButtonGroup(title, parent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } -ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* tqparent, const char* name) - : TQButtonGroup(strips, orient, tqparent, name) +ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name) + : TQButtonGroup(strips, orient, parent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } -ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* tqparent, const char* name) - : TQButtonGroup(strips, orient, title, tqparent, name) +ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name) + : TQButtonGroup(strips, orient, title, parent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h index 9d4a8886a..f4d812653 100644 --- a/kalarm/lib/buttongroup.h +++ b/kalarm/lib/buttongroup.h @@ -41,31 +41,31 @@ class ButtonGroup : public TQButtonGroup TQ_OBJECT public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit ButtonGroup(TQWidget* tqparent, const char* name = 0); + explicit ButtonGroup(TQWidget* parent, const char* name = 0); /** Constructor. * @param title The title displayed for this button group. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - ButtonGroup(const TQString& title, TQWidget* tqparent, const char* name = 0); + ButtonGroup(const TQString& title, TQWidget* parent, const char* name = 0); /** Constructor. * @param strips The number of rows or columns of buttons. * @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - ButtonGroup(int strips, Qt::Orientation orient, TQWidget* tqparent, const char* name = 0); + ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name = 0); /** Constructor. * @param strips The number of rows or columns of buttons. * @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group. * @param title The title displayed for this button group. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* tqparent, const char* name = 0); + ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0); /** Inserts a button in the group. * This overrides the insert() method of TQButtonGroup, which should really be a virtual method... * @param button The button to insert. diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp index b5bfde0ee..d6b02373c 100644 --- a/kalarm/lib/checkbox.cpp +++ b/kalarm/lib/checkbox.cpp @@ -21,15 +21,15 @@ #include "checkbox.moc" -CheckBox::CheckBox(TQWidget* tqparent, const char* name) - : TQCheckBox(tqparent, name), +CheckBox::CheckBox(TQWidget* parent, const char* name) + : TQCheckBox(parent, name), mFocusPolicy(focusPolicy()), mFocusWidget(0), mReadOnly(false) { } -CheckBox::CheckBox(const TQString& text, TQWidget* tqparent, const char* name) - : TQCheckBox(text, tqparent, name), +CheckBox::CheckBox(const TQString& text, TQWidget* parent, const char* name) + : TQCheckBox(text, parent, name), mFocusPolicy(focusPolicy()), mFocusWidget(0), mReadOnly(false) diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h index 61d6a1276..f81490ea9 100644 --- a/kalarm/lib/checkbox.h +++ b/kalarm/lib/checkbox.h @@ -45,16 +45,16 @@ class CheckBox : public TQCheckBox TQ_OBJECT public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit CheckBox(TQWidget* tqparent, const char* name = 0); + explicit CheckBox(TQWidget* parent, const char* name = 0); /** Constructor. * @param text Text to display. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - CheckBox(const TQString& text, TQWidget* tqparent, const char* name = 0); + CheckBox(const TQString& text, TQWidget* parent, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the check box is read-only for the user. If read-only, diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index cd078a34f..4d10f6e63 100644 --- a/kalarm/lib/colourcombo.cpp +++ b/kalarm/lib/colourcombo.cpp @@ -30,8 +30,8 @@ #include "colourcombo.moc" -ColourCombo::ColourCombo(TQWidget* tqparent, const char* name, const TQColor& defaultColour) - : TQComboBox(tqparent, name), +ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defaultColour) + : TQComboBox(parent, name), mColourList(Preferences::messageColours()), mSelectedColour(defaultColour), mCustomColour(255, 255, 255), diff --git a/kalarm/lib/colourcombo.h b/kalarm/lib/colourcombo.h index 31fcdbdcc..2a075d235 100644 --- a/kalarm/lib/colourcombo.h +++ b/kalarm/lib/colourcombo.h @@ -47,11 +47,11 @@ class ColourCombo : public TQComboBox TQ_PROPERTY(TQColor color READ color WRITE setColor) public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. * @param defaultColour The colour which is selected by default. */ - explicit ColourCombo(TQWidget* tqparent = 0, const char* name = 0, const TQColor& defaultColour = 0xFFFFFF); + explicit ColourCombo(TQWidget* parent = 0, const char* name = 0, const TQColor& defaultColour = 0xFFFFFF); /** Returns the selected colour. */ TQColor color() const { return mSelectedColour; } /** Returns the selected colour. */ diff --git a/kalarm/lib/combobox.cpp b/kalarm/lib/combobox.cpp index 2acb5a442..99577506d 100644 --- a/kalarm/lib/combobox.cpp +++ b/kalarm/lib/combobox.cpp @@ -22,13 +22,13 @@ #include "combobox.moc" -ComboBox::ComboBox(TQWidget* tqparent, const char* name) - : TQComboBox(tqparent, name), +ComboBox::ComboBox(TQWidget* parent, const char* name) + : TQComboBox(parent, name), mReadOnly(false) { } -ComboBox::ComboBox(bool rw, TQWidget* tqparent, const char* name) - : TQComboBox(rw, tqparent, name), +ComboBox::ComboBox(bool rw, TQWidget* parent, const char* name) + : TQComboBox(rw, parent, name), mReadOnly(false) { } diff --git a/kalarm/lib/combobox.h b/kalarm/lib/combobox.h index 5f8f4cc3c..3d5ff13e6 100644 --- a/kalarm/lib/combobox.h +++ b/kalarm/lib/combobox.h @@ -40,16 +40,16 @@ class ComboBox : public TQComboBox TQ_OBJECT public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit ComboBox(TQWidget* tqparent = 0, const char* name = 0); + explicit ComboBox(TQWidget* parent = 0, const char* name = 0); /** Constructor. * @param rw True for a read-write combo box, false for a read-only combo box. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit ComboBox(bool rw, TQWidget* tqparent = 0, const char* name = 0); + explicit ComboBox(bool rw, TQWidget* parent = 0, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the combo box is read-only for the user. If read-only, diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 0a916d9f6..b9699988d 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -25,8 +25,8 @@ #include "dateedit.moc" -DateEdit::DateEdit(TQWidget* tqparent, const char* name) - : KDateEdit(tqparent, name) +DateEdit::DateEdit(TQWidget* parent, const char* name) + : KDateEdit(parent, name) { connect(this, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(newDateEntered(const TQDate&))); } diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h index 7ad0a7a05..b221871a9 100644 --- a/kalarm/lib/dateedit.h +++ b/kalarm/lib/dateedit.h @@ -40,10 +40,10 @@ class DateEdit : public KDateEdit TQ_OBJECT public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit DateEdit(TQWidget* tqparent = 0, const char* name = 0); + explicit DateEdit(TQWidget* parent = 0, const char* name = 0); /** Returns true if the widget contains a valid date. */ bool isValid() const { return date().isValid(); } /** Returns the earliest date which can be entered. diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp index ee1750e8b..7767a7659 100644 --- a/kalarm/lib/label.cpp +++ b/kalarm/lib/label.cpp @@ -23,20 +23,20 @@ #include "label.moc" -Label::Label(TQWidget* tqparent, const char* name, WFlags f) - : TQLabel(tqparent, name, f), +Label::Label(TQWidget* parent, const char* name, WFlags f) + : TQLabel(parent, name, f), mRadioButton(0), mFocusWidget(0) { } -Label::Label(const TQString& text, TQWidget* tqparent, const char* name, WFlags f) - : TQLabel(text, tqparent, name, f), +Label::Label(const TQString& text, TQWidget* parent, const char* name, WFlags f) + : TQLabel(text, parent, name, f), mRadioButton(0), mFocusWidget(0) { } -Label::Label(TQWidget* buddy, const TQString& text, TQWidget* tqparent, const char* name, WFlags f) - : TQLabel(buddy, text, tqparent, name, f), +Label::Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name, WFlags f) + : TQLabel(buddy, text, parent, name, f), mRadioButton(0), mFocusWidget(0) { } @@ -103,8 +103,8 @@ void Label::activated() * Class: LabelFocusWidget =============================================================================*/ -LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name) +LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name) + : TQWidget(parent, name) { setFocusPolicy(TQ_ClickFocus); setFixedSize(TQSize(1,1)); @@ -112,7 +112,7 @@ LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name) void LabelFocusWidget::focusInEvent(TQFocusEvent*) { - Label* tqparent = (Label*)parentWidget(); - tqparent->activated(); + Label* parent = (Label*)parentWidget(); + parent->activated(); } diff --git a/kalarm/lib/label.h b/kalarm/lib/label.h index bd0e39035..ba418aee8 100644 --- a/kalarm/lib/label.h +++ b/kalarm/lib/label.h @@ -45,29 +45,29 @@ class Label : public TQLabel friend class LabelFocusWidget; public: /** Constructs an empty label. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. * @param f Flags. See TQWidget constructor for details. */ - explicit Label(TQWidget* tqparent, const char* name = 0, WFlags f = 0); + explicit Label(TQWidget* parent, const char* name = 0, WFlags f = 0); /** Constructs a label that displays @p text. * @param text Text string to display. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. * @param f Flags. See TQWidget constructor for details. */ - Label(const TQString& text, TQWidget* tqparent, const char* name = 0, WFlags f = 0); + Label(const TQString& text, TQWidget* parent, const char* name = 0, WFlags f = 0); /** Constructs a label, with a buddy widget, that displays @p text. * @param buddy Buddy widget which receives the keyboard focus when the * label's accelerator key is pressed. If @p buddy is a radio * button, @p buddy is in addition selected when the * accelerator key is pressed. * @param text Text string to display. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. * @param f Flags. See TQWidget constructor for details. */ - Label(TQWidget* buddy, const TQString& text, TQWidget* tqparent, const char* name = 0, WFlags f = 0); + Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name = 0, WFlags f = 0); /** Sets the label's buddy widget which receives the keyboard focus when the * label's accelerator key is pressed. If @p buddy is a radio button, * @p buddy is in addition selected when the accelerator key is pressed. @@ -90,7 +90,7 @@ class LabelFocusWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - LabelFocusWidget(TQWidget* tqparent, const char* name = 0); + LabelFocusWidget(TQWidget* parent, const char* name = 0); protected: virtual void focusInEvent(TQFocusEvent*); }; diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp index 28d94fb26..0328e4db9 100644 --- a/kalarm/lib/lineedit.cpp +++ b/kalarm/lib/lineedit.cpp @@ -39,8 +39,8 @@ * It has an option to prevent its contents being selected when it receives = focus. =============================================================================*/ -LineEdit::LineEdit(Type type, TQWidget* tqparent, const char* name) - : KLineEdit(tqparent, name), +LineEdit::LineEdit(Type type, TQWidget* parent, const char* name) + : KLineEdit(parent, name), mType(type), mNoSelect(false), mSetCursorAtEnd(false) @@ -48,8 +48,8 @@ LineEdit::LineEdit(Type type, TQWidget* tqparent, const char* name) init(); } -LineEdit::LineEdit(TQWidget* tqparent, const char* name) - : KLineEdit(tqparent, name), +LineEdit::LineEdit(TQWidget* parent, const char* name) + : KLineEdit(parent, name), mType(Text), mNoSelect(false), mSetCursorAtEnd(false) diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h index 0da536835..660d45377 100644 --- a/kalarm/lib/lineedit.h +++ b/kalarm/lib/lineedit.h @@ -62,15 +62,15 @@ class LineEdit : public KLineEdit enum Type { Text, Url, Emails }; /** Constructor. * @param type The content type for the line edit. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit LineEdit(Type type, TQWidget* tqparent = 0, const char* name = 0); + explicit LineEdit(Type type, TQWidget* parent = 0, const char* name = 0); /** Constructs a line edit whose content type is Text. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit LineEdit(TQWidget* tqparent = 0, const char* name = 0); + explicit LineEdit(TQWidget* parent = 0, const char* name = 0); /** Prevents the line edit's contents being selected when the widget receives focus. */ void setNoSelect() { mNoSelect = true; } /** Sets whether the cursor should be set at the beginning or end of the text when diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp index 2f7480dfd..3345c9c4b 100644 --- a/kalarm/lib/messagebox.cpp +++ b/kalarm/lib/messagebox.cpp @@ -60,11 +60,11 @@ KMessageBox::ButtonCode MessageBox::getContinueDefault(const TQString& dontAskAg * warningContinueCancel() for that 'dontAskAgainName' value. If neither method * has set a default button, Continue is the default. */ -int MessageBox::warningContinueCancel(TQWidget* tqparent, const TQString& text, const TQString& caption, +int MessageBox::warningContinueCancel(TQWidget* parent, const TQString& text, const TQString& caption, const KGuiItem& buttonContinue, const TQString& dontAskAgainName) { ButtonCode defaultButton = getContinueDefault(dontAskAgainName); - return warningContinueCancel(tqparent, defaultButton, text, caption, buttonContinue, dontAskAgainName); + return warningContinueCancel(parent, defaultButton, text, caption, buttonContinue, dontAskAgainName); } /****************************************************************************** @@ -72,13 +72,13 @@ int MessageBox::warningContinueCancel(TQWidget* tqparent, const TQString& text, * If 'dontAskAgainName' is specified, the message box will only be suppressed * if the user chose Continue last time. */ -int MessageBox::warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButton, const TQString& text, +int MessageBox::warningContinueCancel(TQWidget* parent, ButtonCode defaultButton, const TQString& text, const TQString& caption, const KGuiItem& buttonContinue, const TQString& dontAskAgainName) { setContinueDefault(dontAskAgainName, defaultButton); if (defaultButton != Cancel) - return KMessageBox::warningContinueCancel(tqparent, text, caption, buttonContinue, dontAskAgainName); + return KMessageBox::warningContinueCancel(parent, text, caption, buttonContinue, dontAskAgainName); // Cancel is the default button, so we have to use KMessageBox::warningYesNo() if (!dontAskAgainName.isEmpty()) @@ -92,7 +92,7 @@ int MessageBox::warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButt saveDontShowAgain(dontAskAgainName, true, false); } } - return warningYesNo(tqparent, text, caption, buttonContinue, KStdGuiItem::cancel(), dontAskAgainName); + return warningYesNo(parent, text, caption, buttonContinue, KStdGuiItem::cancel(), dontAskAgainName); } /****************************************************************************** diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h index 21d321b13..7a84cf202 100644 --- a/kalarm/lib/messagebox.h +++ b/kalarm/lib/messagebox.h @@ -58,7 +58,7 @@ class MessageBox : public KMessageBox */ static void setContinueDefault(const TQString& dontAskAgainName, ButtonCode defaultButton); /** Displays a Continue/Cancel message box with the option as to which button is the default. - * @param tqparent Parent widget + * @param parent Parent widget * @param defaultButton The default button for the message box. Valid values are Continue or Cancel. * @param text Message string * @param caption Caption (window title) of the message box @@ -66,12 +66,12 @@ class MessageBox : public KMessageBox * @param dontAskAgainName If specified, the message box will only be suppressed * if the user chose Continue last time. */ - static int warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButton, const TQString& text, + static int warningContinueCancel(TQWidget* parent, ButtonCode defaultButton, const TQString& text, const TQString& caption = TQString(), const KGuiItem& buttonContinue = KStdGuiItem::cont(), const TQString& dontAskAgainName = TQString()); /** Displays a Continue/Cancel message box. - * @param tqparent Parent widget + * @param parent Parent widget * @param text Message string * @param caption Caption (window title) of the message box * @param buttonContinue The text for the first button (default = i18n("Continue")) @@ -81,7 +81,7 @@ class MessageBox : public KMessageBox * @p dontAskAgainName value. If neither method has been used to set a default button, * Continue is the default. */ - static int warningContinueCancel(TQWidget* tqparent, const TQString& text, const TQString& caption = TQString(), + static int warningContinueCancel(TQWidget* parent, const TQString& text, const TQString& caption = TQString(), const KGuiItem& buttonContinue = KStdGuiItem::cont(), const TQString& dontAskAgainName = TQString()); /** If there is no current setting for whether a non-Yes/No message box should be diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp index 883ad1812..f1f824d24 100644 --- a/kalarm/lib/pushbutton.cpp +++ b/kalarm/lib/pushbutton.cpp @@ -21,20 +21,20 @@ #include "pushbutton.moc" -PushButton::PushButton(TQWidget* tqparent, const char* name) - : TQPushButton(tqparent, name), +PushButton::PushButton(TQWidget* parent, const char* name) + : TQPushButton(parent, name), mFocusPolicy(focusPolicy()), mReadOnly(false) { } -PushButton::PushButton(const TQString& text, TQWidget* tqparent, const char* name) - : TQPushButton(text, tqparent, name), +PushButton::PushButton(const TQString& text, TQWidget* parent, const char* name) + : TQPushButton(text, parent, name), mFocusPolicy(focusPolicy()), mReadOnly(false) { } -PushButton::PushButton(const TQIconSet& icon, const TQString& text, TQWidget* tqparent, const char* name) - : TQPushButton(icon, text, tqparent, name), +PushButton::PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name) + : TQPushButton(icon, text, parent, name), mFocusPolicy(focusPolicy()), mReadOnly(false) { } diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h index 52c761bce..d3aee32cd 100644 --- a/kalarm/lib/pushbutton.h +++ b/kalarm/lib/pushbutton.h @@ -41,23 +41,23 @@ class PushButton : public TQPushButton TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly) public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit PushButton(TQWidget* tqparent, const char* name = 0); + explicit PushButton(TQWidget* parent, const char* name = 0); /** Constructor for a push button which displays a text. * @param text The text to show on the button. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - PushButton(const TQString& text, TQWidget* tqparent, const char* name = 0); + PushButton(const TQString& text, TQWidget* parent, const char* name = 0); /** Constructor for a push button which displays an icon and a text. * @param icon The icon to show on the button. * @param text The text to show on the button. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - PushButton(const TQIconSet& icon, const TQString& text, TQWidget* tqparent, const char* name = 0); + PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name = 0); /** Sets whether the push button is read-only for the user. * @param readOnly True to set the widget read-only, false to enable its action. */ diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp index 6331c06f5..18571ad7f 100644 --- a/kalarm/lib/radiobutton.cpp +++ b/kalarm/lib/radiobutton.cpp @@ -21,15 +21,15 @@ #include "radiobutton.moc" -RadioButton::RadioButton(TQWidget* tqparent, const char* name) - : TQRadioButton(tqparent, name), +RadioButton::RadioButton(TQWidget* parent, const char* name) + : TQRadioButton(parent, name), mFocusPolicy(focusPolicy()), mFocusWidget(0), mReadOnly(false) { } -RadioButton::RadioButton(const TQString& text, TQWidget* tqparent, const char* name) - : TQRadioButton(text, tqparent, name), +RadioButton::RadioButton(const TQString& text, TQWidget* parent, const char* name) + : TQRadioButton(text, parent, name), mFocusPolicy(focusPolicy()), mFocusWidget(0), mReadOnly(false) diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h index 2f924b24d..107957ca7 100644 --- a/kalarm/lib/radiobutton.h +++ b/kalarm/lib/radiobutton.h @@ -45,16 +45,16 @@ class RadioButton : public TQRadioButton TQ_OBJECT public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit RadioButton(TQWidget* tqparent, const char* name = 0); + explicit RadioButton(TQWidget* parent, const char* name = 0); /** Constructor. * @param text Text to display. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - RadioButton(const TQString& text, TQWidget* tqparent, const char* name = 0); + RadioButton(const TQString& text, TQWidget* parent, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the radio button is read-only for the user. If read-only, diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp index f901f6db1..189c8941a 100644 --- a/kalarm/lib/slider.cpp +++ b/kalarm/lib/slider.cpp @@ -21,18 +21,18 @@ #include "slider.moc" -Slider::Slider(TQWidget* tqparent, const char* name) - : TQSlider(tqparent, name), +Slider::Slider(TQWidget* parent, const char* name) + : TQSlider(parent, name), mReadOnly(false) { } -Slider::Slider(Qt::Orientation o, TQWidget* tqparent, const char* name) - : TQSlider(o, tqparent, name), +Slider::Slider(Qt::Orientation o, TQWidget* parent, const char* name) + : TQSlider(o, parent, name), mReadOnly(false) { } -Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* tqparent, const char* name) - : TQSlider(minval, maxval, pageStep, value, o, tqparent, name), +Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* parent, const char* name) + : TQSlider(minval, maxval, pageStep, value, o, parent, name), mReadOnly(false) { } diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h index f79ac0158..6b72c5ba6 100644 --- a/kalarm/lib/slider.h +++ b/kalarm/lib/slider.h @@ -41,27 +41,27 @@ class Slider : public TQSlider TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly) public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit Slider(TQWidget* tqparent = 0, const char* name = 0); + explicit Slider(TQWidget* parent = 0, const char* name = 0); /** Constructor. * @param orient The orientation of the slider, either TQt::Horizonal or TQt::Vertical. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit Slider(Qt::Orientation orient, TQWidget* tqparent = 0, const char* name = 0); + explicit Slider(Qt::Orientation orient, TQWidget* parent = 0, const char* name = 0); /** Constructor. * @param minValue The minimum value which the slider can have. * @param maxValue The maximum value which the slider can have. * @param pageStep The page step increment. * @param value The initial value for the slider. * @param orient The orientation of the slider, either TQt::Horizonal or TQt::Vertical. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ Slider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orient, - TQWidget* tqparent = 0, const char* name = 0); + TQWidget* parent = 0, const char* name = 0); /** Returns true if the slider is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the slider is read-only for the user. diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index 10f3f5917..625186ca9 100644 --- a/kalarm/lib/spinbox.cpp +++ b/kalarm/lib/spinbox.cpp @@ -24,16 +24,16 @@ #include "spinbox.moc" -SpinBox::SpinBox(TQWidget* tqparent, const char* name) - : TQSpinBox(0, 99999, 1, tqparent, name), +SpinBox::SpinBox(TQWidget* parent, const char* name) + : TQSpinBox(0, 99999, 1, parent, name), mMinValue(TQSpinBox::minValue()), mMaxValue(TQSpinBox::maxValue()) { init(); } -SpinBox::SpinBox(int minValue, int maxValue, int step, TQWidget* tqparent, const char* name) - : TQSpinBox(minValue, maxValue, step, tqparent, name), +SpinBox::SpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name) + : TQSpinBox(minValue, maxValue, step, parent, name), mMinValue(minValue), mMaxValue(maxValue) { diff --git a/kalarm/lib/spinbox.h b/kalarm/lib/spinbox.h index 4b269d6a5..081087db0 100644 --- a/kalarm/lib/spinbox.h +++ b/kalarm/lib/spinbox.h @@ -45,18 +45,18 @@ class SpinBox : public TQSpinBox TQ_OBJECT public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit SpinBox(TQWidget* tqparent = 0, const char* name = 0); + explicit SpinBox(TQWidget* parent = 0, const char* name = 0); /** Constructor. * @param minValue The minimum value which the spin box can have. * @param maxValue The maximum value which the spin box can have. * @param step The (unshifted) step interval. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - SpinBox(int minValue, int maxValue, int step = 1, TQWidget* tqparent = 0, const char* name = 0); + SpinBox(int minValue, int maxValue, int step = 1, TQWidget* parent = 0, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the spin box can be changed by the user. diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp index bdd887912..3ec3b68c0 100644 --- a/kalarm/lib/spinbox2.cpp +++ b/kalarm/lib/spinbox2.cpp @@ -48,8 +48,8 @@ static bool mirrorStyle(const TQStyle&); int SpinBox2::mReverseLayout = -1; -SpinBox2::SpinBox2(TQWidget* tqparent, const char* name) - : TQFrame(tqparent, name), +SpinBox2::SpinBox2(TQWidget* parent, const char* name) + : TQFrame(parent, name), mReverseWithLayout(true) { mUpdown2Frame = new TQFrame(this); @@ -60,8 +60,8 @@ SpinBox2::SpinBox2(TQWidget* tqparent, const char* name) init(); } -SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, TQWidget* tqparent, const char* name) - : TQFrame(tqparent, name), +SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, TQWidget* parent, const char* name) + : TQFrame(parent, name), mReverseWithLayout(true) { mUpdown2Frame = new TQFrame(this); @@ -371,7 +371,7 @@ int SpinBox2::MainSpinBox::shiftStepAdjustment(int oldValue, int shiftStep) /****************************************************************************** * Repaint the widget. -* If it's the first time since a style change, tell the tqparent SpinBox2 to +* If it's the first time since a style change, tell the parent SpinBox2 to * update the SpinMirror with the new unpressed button image. We make the * presumably reasonable assumption that when a style change occurs, the spin * buttons are unpressed. @@ -391,8 +391,8 @@ void ExtraSpinBox::paintEvent(TQPaintEvent* e) = Class SpinMirror =============================================================================*/ -SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* tqparent, const char* name) - : TQCanvasView(new TQCanvas, tqparent, name), +SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* parent, const char* name) + : TQCanvasView(new TQCanvas, parent, name), mSpinbox(spinbox), mSpinFrame(spinFrame), mReadOnly(false) diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h index f83db252a..4391fbb9c 100644 --- a/kalarm/lib/spinbox2.h +++ b/kalarm/lib/spinbox2.h @@ -59,20 +59,20 @@ class SpinBox2 : public TQFrame TQ_OBJECT public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit SpinBox2(TQWidget* tqparent = 0, const char* name = 0); + explicit SpinBox2(TQWidget* parent = 0, const char* name = 0); /** Constructor. * @param minValue The minimum value which the spin box can have. * @param maxValue The maximum value which the spin box can have. * @param step The (unshifted) step interval for the right-hand spin buttons. * @param step2 The (unshifted) step interval for the left-hand spin buttons. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ SpinBox2(int minValue, int maxValue, int step = 1, int step2 = 1, - TQWidget* tqparent = 0, const char* name = 0); + TQWidget* parent = 0, const char* name = 0); /** Sets whether the spin box can be changed by the user. * @param readOnly True to set the widget read-only, false to set it read-write. */ @@ -282,10 +282,10 @@ class SpinBox2 : public TQFrame class MainSpinBox : public SpinBox { public: - MainSpinBox(SpinBox2* sb2, TQWidget* tqparent, const char* name = 0) - : SpinBox(tqparent, name), owner(sb2) { } - MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* tqparent, const char* name = 0) - : SpinBox(minValue, maxValue, step, tqparent, name), owner(sb2) { } + MainSpinBox(SpinBox2* sb2, TQWidget* parent, const char* name = 0) + : SpinBox(parent, name), owner(sb2) { } + MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* parent, const char* name = 0) + : SpinBox(minValue, maxValue, step, parent, name), owner(sb2) { } void tqsetAlignment(int a) { editor()->tqsetAlignment(a); } virtual TQString mapValueToText(int v) { return owner->mapValueToText(v); } virtual int mapTextToValue(bool* ok) { return owner->mapTextToValue(ok); } diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h index 1c5a71ee6..c1c116b04 100644 --- a/kalarm/lib/spinbox2private.h +++ b/kalarm/lib/spinbox2private.h @@ -36,10 +36,10 @@ class ExtraSpinBox : public SpinBox Q_OBJECT TQ_OBJECT public: - explicit ExtraSpinBox(TQWidget* tqparent, const char* name = 0) - : SpinBox(tqparent, name), mNewStylePending(false) { } - ExtraSpinBox(int minValue, int maxValue, int step, TQWidget* tqparent, const char* name = 0) - : SpinBox(minValue, maxValue, step, tqparent, name), mNewStylePending(false) { } + explicit ExtraSpinBox(TQWidget* parent, const char* name = 0) + : SpinBox(parent, name), mNewStylePending(false) { } + ExtraSpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name = 0) + : SpinBox(minValue, maxValue, step, parent, name), mNewStylePending(false) { } signals: void styleUpdated(); protected: @@ -63,7 +63,7 @@ class SpinMirror : public TQCanvasView Q_OBJECT TQ_OBJECT public: - explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* tqparent = 0, const char* name = 0); + explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* parent = 0, const char* name = 0); void setReadOnly(bool ro) { mReadOnly = ro; } bool isReadOnly() const { return mReadOnly; } void setNormalButtons(const TQPixmap&); diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp index 923bef8b3..170914922 100644 --- a/kalarm/lib/timeedit.cpp +++ b/kalarm/lib/timeedit.cpp @@ -28,8 +28,8 @@ #include "timeedit.moc" -TimeEdit::TimeEdit(TQWidget* tqparent, const char* name) - : TQHBox(tqparent, name), +TimeEdit::TimeEdit(TQWidget* parent, const char* name) + : TQHBox(parent, name), mAmPm(0), mAmIndex(-1), mPmIndex(-1), diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h index 7be73c1f9..658fe7805 100644 --- a/kalarm/lib/timeedit.h +++ b/kalarm/lib/timeedit.h @@ -53,10 +53,10 @@ class TimeEdit : public TQHBox TQ_OBJECT public: /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit TimeEdit(TQWidget* tqparent = 0, const char* name = 0); + explicit TimeEdit(TQWidget* parent = 0, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the widget is read-only for the user. If read-only, diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp index 9b41e40d4..291ba0872 100644 --- a/kalarm/lib/timeperiod.cpp +++ b/kalarm/lib/timeperiod.cpp @@ -50,8 +50,8 @@ static const int maxMinutes = 1000*60-1; // absolute maximum value for hours:m = Contains a time unit combo box, plus a time spinbox, to select a time period. =============================================================================*/ -TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* tqparent, const char* name) - : TQHBox(tqparent, name), +TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name) + : TQHBox(parent, name), mMaxDays(9999), mNoHourMinute(!allowHourMinute), mReadOnly(false) diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h index 86b663798..9c4152b76 100644 --- a/kalarm/lib/timeperiod.h +++ b/kalarm/lib/timeperiod.h @@ -65,10 +65,10 @@ class TimePeriod : public TQHBox * being allowed as units; only days and weeks can ever be used, * regardless of other method calls. Set true to allow minutes, * hours/minutes, days or weeks as units. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - TimePeriod(bool allowMinute, TQWidget* tqparent, const char* name = 0); + TimePeriod(bool allowMinute, TQWidget* parent, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the widget is read-only for the user. If read-only, diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp index ccf0c4492..f756112e8 100644 --- a/kalarm/lib/timespinbox.cpp +++ b/kalarm/lib/timespinbox.cpp @@ -30,8 +30,8 @@ class TimeSpinBox::TimeValidator : public TQValidator { public: - TimeValidator(int minMin, int maxMin, TQWidget* tqparent, const char* name = 0) - : TQValidator(TQT_TQOBJECT(tqparent), name), + TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0) + : TQValidator(TQT_TQOBJECT(parent), name), minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { } virtual State validate(TQString&, int&) const; int minMinute, maxMinute; @@ -54,8 +54,8 @@ class TimeSpinBox::TimeValidator : public TQValidator /****************************************************************************** * Construct a wrapping 00:00 - 23:59, or 12:00 - 11:59 time spin box. */ -TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* tqparent, const char* name) - : SpinBox2(0, 1439, 1, 60, tqparent, name), +TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name) + : SpinBox2(0, 1439, 1, 60, parent, name), mMinimumValue(0), m12Hour(!use24hour), mPm(false), @@ -76,8 +76,8 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* tqparent, const char* name) /****************************************************************************** * Construct a non-wrapping time spin box. */ -TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* tqparent, const char* name) - : SpinBox2(minMinute, maxMinute, 1, 60, tqparent, name), +TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const char* name) + : SpinBox2(minMinute, maxMinute, 1, 60, parent, name), mMinimumValue(minMinute), m12Hour(false), mInvalid(false), diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h index 4bacd4947..0be232453 100644 --- a/kalarm/lib/timespinbox.h +++ b/kalarm/lib/timespinbox.h @@ -50,17 +50,17 @@ class TimeSpinBox : public SpinBox2 /** Constructor for a wrapping time spin box which can be used to enter a time of day. * @param use24hour True for entry of 24-hour clock times (range 00:00 to 23:59). * False for entry of 12-hour clock times (range 12:00 to 11:59). - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit TimeSpinBox(bool use24hour, TQWidget* tqparent = 0, const char* name = 0); + explicit TimeSpinBox(bool use24hour, TQWidget* parent = 0, const char* name = 0); /** Constructor for a non-wrapping time spin box which can be used to enter a length of time. * @param minMinute The minimum value which the spin box can hold, in minutes. * @param maxMinute The maximum value which the spin box can hold, in minutes. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - TimeSpinBox(int minMinute, int maxMinute, TQWidget* tqparent = 0, const char* name = 0); + TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent = 0, const char* name = 0); /** Returns true if the spin box holds a valid value. * An invalid value is displayed as asterisks. */ diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index aa334c670..3bef1a6f7 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -221,7 +221,7 @@ void MainWindow::readProperties(KConfig* config) } /****************************************************************************** -* Get the main main window, i.e. the tqparent of the system tray icon, or if +* Get the main main window, i.e. the parent of the system tray icon, or if * none, the first main window to be created. Visible windows take precedence * over hidden ones. */ @@ -241,7 +241,7 @@ MainWindow* MainWindow::mainMainWindow() } /****************************************************************************** -* Check whether this main window is the tqparent of the system tray icon. +* Check whether this main window is the parent of the system tray icon. */ bool MainWindow::isTrayParent() const { @@ -1118,7 +1118,7 @@ void MainWindow::closeEvent(TQCloseEvent* ce) if (!theApp()->sessionClosingDown() && isTrayParent()) { // The user (not the session manager) wants to close the window. - // It's the tqparent window of the system tray icon, so just hide + // It's the parent window of the system tray icon, so just hide // it to prevent the system tray icon closing. hide(); theApp()->quitIf(); diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h index 45bb7fb66..a6ba5ed33 100644 --- a/kalarm/mainwindowbase.h +++ b/kalarm/mainwindowbase.h @@ -37,8 +37,8 @@ class MainWindowBase : public KMainWindow TQ_OBJECT public: - explicit MainWindowBase(TQWidget* tqparent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose) - : KMainWindow(tqparent, name, f), disableQuit(false) { } + explicit MainWindowBase(TQWidget* parent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose) + : KMainWindow(parent, name, f), disableQuit(false) { } protected: virtual void closeEvent(TQCloseEvent*); diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 6f0878c00..755a1e223 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -93,8 +93,8 @@ static bool wantModal(); class MessageText : public TQTextEdit { public: - MessageText(const TQString& text, const TQString& context = TQString(), TQWidget* tqparent = 0, const char* name = 0) - : TQTextEdit(text, context, tqparent, name) + MessageText(const TQString& text, const TQString& context = TQString(), TQWidget* parent = 0, const char* name = 0) + : TQTextEdit(text, context, parent, name) { setReadOnly(true); setWordWrap(TQTextEdit::NoWrap); diff --git a/kalarm/pickfileradio.cpp b/kalarm/pickfileradio.cpp index dfe0f41a9..15b56d942 100644 --- a/kalarm/pickfileradio.cpp +++ b/kalarm/pickfileradio.cpp @@ -30,15 +30,15 @@ #include "pickfileradio.moc" -PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* tqparent, const char* name) - : RadioButton(text, tqparent, name), - mGroup(tqparent), +PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name) + : RadioButton(text, parent, name), + mGroup(parent), mEdit(edit), mButton(button), mLastId(-1), // set to an invalid value mRevertId(false) { - Q_ASSERT(tqparent); + Q_ASSERT(parent); Q_ASSERT(button); mButton->setEnabled(false); connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); @@ -47,15 +47,15 @@ PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQStrin connect(mGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotSelectionChanged(int))); } -PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name) - : RadioButton(text, tqparent, name), - mGroup(tqparent), +PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name) + : RadioButton(text, parent, name), + mGroup(parent), mEdit(0), mButton(0), mLastId(-1), // set to an invalid value mRevertId(false) { - Q_ASSERT(tqparent); + Q_ASSERT(parent); } void PickFileRadio::init(TQPushButton* button, LineEdit* edit) diff --git a/kalarm/pickfileradio.h b/kalarm/pickfileradio.h index a8d12383e..72b431102 100644 --- a/kalarm/pickfileradio.h +++ b/kalarm/pickfileradio.h @@ -38,7 +38,7 @@ class LineEdit; * To achieve this, whenever the button is newly selected and the * file name is currently blank, the file picker dialogue is displayed to choose a * file. If the dialogue exits without a file being chosen, the radio button selection - * is reverted to the previously selected button in the tqparent button group. + * is reverted to the previously selected button in the parent button group. * * The class handles the activation of the file picker dialogue (via a virtual method * which must be supplied by deriving a class from this one). It also handles all @@ -56,17 +56,17 @@ class PickFileRadio : public RadioButton * @param button Push button to invoke the file picker dialogue. * @param edit File name edit widget, or null if there is none. * @param text Radio button's text. - * @param tqparent Button group which is to be the tqparent object for the radio button. + * @param parent Button group which is to be the parent object for the radio button. * @param name The name of this widget. */ - PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* tqparent, const char* name = 0); + PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name = 0); /** Constructor. * The init() method must be called before the widget can be used. * @param text Radio button's text. - * @param tqparent Button group which is to be the tqparent object for the radio button. + * @param parent Button group which is to be the parent object for the radio button. * @param name The name of this widget. */ - PickFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name = 0); + PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = 0); /** Initialises the widget. * @param button Push button to invoke the file picker dialogue. * @param edit File name edit widget, or null if there is none. diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 264824b3c..2a10c1a33 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -82,8 +82,8 @@ TQString RecurrenceEdit::i18n_Yearly() { return i18n("Yearly"); } TQString RecurrenceEdit::i18n_y_Yearly() { return i18n("&Yearly"); } -RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* name) - : TQFrame(tqparent, name), +RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name) + : TQFrame(parent, name), mRule(0), mRuleButtonType(INVALID_RECUR), mDailyShown(false), @@ -1019,8 +1019,8 @@ bool RecurrenceEdit::stateChanged() const = Base class for rule widgets, including recurrence frequency. =============================================================================*/ -Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, TQWidget* tqparent, const char* name) - : NoRule(tqparent, name) +Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, TQWidget* parent, const char* name) + : NoRule(parent, name) { mLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQHBox* freqBox = new TQHBox(this); @@ -1095,10 +1095,10 @@ bool Rule::stateChanged() const = Sub-daily rule widget. =============================================================================*/ -SubDailyRule::SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name) +SubDailyRule::SubDailyRule(bool readOnly, TQWidget* parent, const char* name) : Rule(i18n("hours:minutes"), i18n("Enter the number of hours and minutes between repetitions of the alarm"), - true, readOnly, tqparent, name) + true, readOnly, parent, name) { } @@ -1108,8 +1108,8 @@ SubDailyRule::SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name) =============================================================================*/ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis, - bool readOnly, TQWidget* tqparent, const char* name) - : Rule(freqText, freqWhatsThis, false, readOnly, tqparent, name), + bool readOnly, TQWidget* parent, const char* name) + : Rule(freqText, freqWhatsThis, false, readOnly, parent, name), mSavedDays(7) { TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint()); @@ -1221,11 +1221,11 @@ bool DayWeekRule::stateChanged() const = Daily rule widget. =============================================================================*/ -DailyRule::DailyRule(bool readOnly, TQWidget* tqparent, const char* name) +DailyRule::DailyRule(bool readOnly, TQWidget* parent, const char* name) : DayWeekRule(i18n("day(s)"), i18n("Enter the number of days between repetitions of the alarm"), i18n("Select the days of the week on which the alarm is allowed to occur"), - readOnly, tqparent, name) + readOnly, parent, name) { } @@ -1234,11 +1234,11 @@ DailyRule::DailyRule(bool readOnly, TQWidget* tqparent, const char* name) = Weekly rule widget. =============================================================================*/ -WeeklyRule::WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name) +WeeklyRule::WeeklyRule(bool readOnly, TQWidget* parent, const char* name) : DayWeekRule(i18n("week(s)"), i18n("Enter the number of weeks between repetitions of the alarm"), i18n("Select the days of the week on which to repeat the alarm"), - readOnly, tqparent, name) + readOnly, parent, name) { } @@ -1248,8 +1248,8 @@ WeeklyRule::WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name) =============================================================================*/ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhatsThis, bool allowEveryWeek, - bool readOnly, TQWidget* tqparent, const char* name) - : Rule(freqText, freqWhatsThis, false, readOnly, tqparent, name), + bool readOnly, TQWidget* parent, const char* name) + : Rule(freqText, freqWhatsThis, false, readOnly, parent, name), mEveryWeek(allowEveryWeek) { mButtonGroup = new ButtonGroup(this); @@ -1438,10 +1438,10 @@ bool MonthYearRule::stateChanged() const = Monthly rule widget. =============================================================================*/ -MonthlyRule::MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name) +MonthlyRule::MonthlyRule(bool readOnly, TQWidget* parent, const char* name) : MonthYearRule(i18n("month(s)"), i18n("Enter the number of months between repetitions of the alarm"), - false, readOnly, tqparent, name) + false, readOnly, parent, name) { } @@ -1450,10 +1450,10 @@ MonthlyRule::MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name) = Yearly rule widget. =============================================================================*/ -YearlyRule::YearlyRule(bool readOnly, TQWidget* tqparent, const char* name) +YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) : MonthYearRule(i18n("year(s)"), i18n("Enter the number of years between repetitions of the alarm"), - true, readOnly, tqparent, name) + true, readOnly, parent, name) { // Set up the month selection widgets TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint()); diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h index 893b4456d..5b3aae479 100644 --- a/kalarm/recurrenceedit.h +++ b/kalarm/recurrenceedit.h @@ -61,7 +61,7 @@ class RecurrenceEdit : public TQFrame // Don't alter the order of these recurrence types enum RepeatType { INVALID_RECUR = -1, NO_RECUR, AT_LOGIN, SUBDAILY, DAILY, WEEKLY, MONTHLY, ANNUAL }; - RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* name = 0); + RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name = 0); virtual ~RecurrenceEdit() { } /** Set widgets to default values */ diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h index 659921d5b..68dd429b9 100644 --- a/kalarm/recurrenceeditprivate.h +++ b/kalarm/recurrenceeditprivate.h @@ -39,7 +39,7 @@ class TQString; class NoRule : public TQFrame { public: - NoRule(TQWidget* tqparent, const char* name = 0) : TQFrame(tqparent, name) + NoRule(TQWidget* parent, const char* name = 0) : TQFrame(parent, name) { setFrameStyle(TQFrame::NoFrame); } virtual int frequency() const { return 0; } }; @@ -50,7 +50,7 @@ class Rule : public NoRule TQ_OBJECT public: Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); int frequency() const; void setFrequency(int); virtual void setFrequencyFocus() { mSpinBox->setFocus(); } @@ -75,7 +75,7 @@ class SubDailyRule : public Rule Q_OBJECT TQ_OBJECT public: - SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name = 0); + SubDailyRule(bool readOnly, TQWidget* parent, const char* name = 0); }; // Daily/weekly rule choices base class @@ -85,7 +85,7 @@ class DayWeekRule : public Rule TQ_OBJECT public: DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis, - bool readOnly, TQWidget* tqparent, const char* name = 0); + bool readOnly, TQWidget* parent, const char* name = 0); TQBitArray days() const; void setDays(bool); void setDays(const TQBitArray& days); @@ -103,14 +103,14 @@ class DayWeekRule : public Rule class DailyRule : public DayWeekRule { public: - DailyRule(bool readOnly, TQWidget* tqparent, const char* name = 0); + DailyRule(bool readOnly, TQWidget* parent, const char* name = 0); }; // Weekly rule choices class WeeklyRule : public DayWeekRule { public: - WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name = 0); + WeeklyRule(bool readOnly, TQWidget* parent, const char* name = 0); }; // Monthly/yearly rule choices base class @@ -122,7 +122,7 @@ class MonthYearRule : public Rule enum DayPosType { DATE, POS }; MonthYearRule(const TQString& freqText, const TQString& freqWhatsThis, bool allowEveryWeek, - bool readOnly, TQWidget* tqparent, const char* name = 0); + bool readOnly, TQWidget* parent, const char* name = 0); DayPosType type() const; int date() const; // if date in month is selected int week() const; // if position is selected @@ -165,7 +165,7 @@ class MonthYearRule : public Rule class MonthlyRule : public MonthYearRule { public: - MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name = 0); + MonthlyRule(bool readOnly, TQWidget* parent, const char* name = 0); }; // Yearly rule choices @@ -174,7 +174,7 @@ class YearlyRule : public MonthYearRule Q_OBJECT TQ_OBJECT public: - YearlyRule(bool readOnly, TQWidget* tqparent, const char* name = 0); + YearlyRule(bool readOnly, TQWidget* parent, const char* name = 0); TQValueList<int> months() const; void setMonths(const TQValueList<int>& months); void setDefaultValues(int dayOfMonth, int dayOfWeek, int month); diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp index ee197e73a..e10e04e22 100644 --- a/kalarm/reminder.cpp +++ b/kalarm/reminder.cpp @@ -41,8 +41,8 @@ TQString Reminder::i18n_u_first_recurrence_only() { return i18n("Reminder for fi Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis, - bool allowHourMinute, bool showOnceOnly, TQWidget* tqparent, const char* name) - : TQFrame(tqparent, name), + bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name) + : TQFrame(parent, name), mReadOnly(false), mOnceOnlyEnabled(showOnceOnly) { diff --git a/kalarm/reminder.h b/kalarm/reminder.h index f9e2b57fc..7e58e8b71 100644 --- a/kalarm/reminder.h +++ b/kalarm/reminder.h @@ -33,7 +33,7 @@ class Reminder : public TQFrame TQ_OBJECT public: Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis, - bool allowHourMinute, bool showOnceOnly, TQWidget* tqparent, const char* name = 0); + bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name = 0); bool isReminder() const; bool isOnceOnly() const; int minutes() const; diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp index 5dac94dcf..403250ba5 100644 --- a/kalarm/repetition.cpp +++ b/kalarm/repetition.cpp @@ -40,8 +40,8 @@ = Button to display the Alarm Sub-Repetition dialogue. =============================================================================*/ -RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* tqparent, const char* name) - : TQPushButton(caption, tqparent, name), +RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name) + : TQPushButton(caption, parent, name), mDialog(0), mInterval(0), mCount(0), @@ -149,8 +149,8 @@ void RepetitionButton::displayDialog() static const int MAX_COUNT = 9999; // maximum range for count spinbox -RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, true, caption, Ok|Cancel), +RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent, const char* name) + : KDialogBase(parent, name, true, caption, Ok|Cancel), mMaxDuration(-1), mDateOnly(false), mReadOnly(readOnly) diff --git a/kalarm/repetition.h b/kalarm/repetition.h index c2b0ebd6c..a98493c55 100644 --- a/kalarm/repetition.h +++ b/kalarm/repetition.h @@ -37,7 +37,7 @@ class RepetitionButton : public TQPushButton Q_OBJECT TQ_OBJECT public: - RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* tqparent, const char* name = 0); + RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name = 0); void set(int interval, int count); void set(int interval, int count, bool dateOnly, int maxDuration = -1); void initialise(int interval, int count, bool dateOnly, int maxDuration = -1); // use only after needsInitialisation() signal @@ -73,7 +73,7 @@ class RepetitionDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* tqparent = 0, const char* name = 0); + RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent = 0, const char* name = 0); void setReadOnly(bool); void set(int interval, int count, bool dateOnly = false, int maxDuration = -1); int interval() const; // get the interval between repetitions, in minutes diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index feb53bd68..c7a6adcfb 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -69,8 +69,8 @@ static const char SOUND_DIALOG_NAME[] = "SoundDialog"; SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat, - const TQString& caption, TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false), + const TQString& caption, TQWidget* parent, const char* name) + : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false), mReadOnly(false), mArtsDispatcher(0), mPlayObject(0), diff --git a/kalarm/sounddlg.h b/kalarm/sounddlg.h index bcc8dd92d..53dd2f96b 100644 --- a/kalarm/sounddlg.h +++ b/kalarm/sounddlg.h @@ -42,7 +42,7 @@ class SoundDlg : public KDialogBase TQ_OBJECT public: SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat, - const TQString& caption, TQWidget* tqparent, const char* name = 0); + const TQString& caption, TQWidget* parent, const char* name = 0); ~SoundDlg(); void setReadOnly(bool); bool isReadOnly() const { return mReadOnly; } diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index c6915601b..ed55b8112 100644 --- a/kalarm/soundpicker.cpp +++ b/kalarm/soundpicker.cpp @@ -55,8 +55,8 @@ TQString SoundPicker::i18n_Speak() { return i18n("Speak"); } TQString SoundPicker::i18n_File() { return i18n("Sound file"); } -SoundPicker::SoundPicker(TQWidget* tqparent, const char* name) - : TQFrame(tqparent, name) +SoundPicker::SoundPicker(TQWidget* parent, const char* name) + : TQFrame(parent, name) { setFrameStyle(TQFrame::NoFrame); TQHBoxLayout* soundLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); diff --git a/kalarm/soundpicker.h b/kalarm/soundpicker.h index eaf0ec16b..5f89d5354 100644 --- a/kalarm/soundpicker.h +++ b/kalarm/soundpicker.h @@ -43,10 +43,10 @@ class SoundPicker : public TQFrame */ enum Type { NONE = 0, BEEP, PLAY_FILE, SPEAK }; /** Constructor. - * @param tqparent The tqparent object of this widget. + * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit SoundPicker(TQWidget* tqparent, const char* name = 0); + explicit SoundPicker(TQWidget* parent, const char* name = 0); /** Initialises the widget's state. * @param type The option to select. * @param filename The full path or URL of the sound file to select. If the 'file' option is diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp index 919524aff..02a0543f0 100644 --- a/kalarm/specialactions.cpp +++ b/kalarm/specialactions.cpp @@ -40,8 +40,8 @@ = Button to display the Special Alarm Actions dialogue. =============================================================================*/ -SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* tqparent, const char* name) - : TQPushButton(caption, tqparent, name), +SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* parent, const char* name) + : TQPushButton(caption, parent, name), mReadOnly(false) { setToggleButton(true); @@ -90,8 +90,8 @@ static const char SPEC_ACT_DIALOG_NAME[] = "SpecialActionsDialog"; SpecialActionsDlg::SpecialActionsDlg(const TQString& preAction, const TQString& postAction, - const TQString& caption, TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false) + const TQString& caption, TQWidget* parent, const char* name) + : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false) { TQWidget* page = new TQWidget(this); setMainWidget(page); @@ -134,8 +134,8 @@ void SpecialActionsDlg::resizeEvent(TQResizeEvent* re) = Pre- and post-alarm actions widget. =============================================================================*/ -SpecialActions::SpecialActions(TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name), +SpecialActions::SpecialActions(TQWidget* parent, const char* name) + : TQWidget(parent, name), mReadOnly(false) { TQBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); diff --git a/kalarm/specialactions.h b/kalarm/specialactions.h index 58f5c7d62..43d8cdf9d 100644 --- a/kalarm/specialactions.h +++ b/kalarm/specialactions.h @@ -33,7 +33,7 @@ class SpecialActionsButton : public TQPushButton Q_OBJECT TQ_OBJECT public: - SpecialActionsButton(const TQString& caption, TQWidget* tqparent = 0, const char* name = 0); + SpecialActionsButton(const TQString& caption, TQWidget* parent = 0, const char* name = 0); void setActions(const TQString& pre, const TQString& post); const TQString& preAction() const { return mPreAction; } const TQString& postAction() const { return mPostAction; } @@ -59,7 +59,7 @@ class SpecialActions : public TQWidget Q_OBJECT TQ_OBJECT public: - SpecialActions(TQWidget* tqparent = 0, const char* name = 0); + SpecialActions(TQWidget* parent = 0, const char* name = 0); void setActions(const TQString& pre, const TQString& post); TQString preAction() const; TQString postAction() const; @@ -80,7 +80,7 @@ class SpecialActionsDlg : public KDialogBase TQ_OBJECT public: SpecialActionsDlg(const TQString& preAction, const TQString& postAction, - const TQString& caption, TQWidget* tqparent = 0, const char* name = 0); + const TQString& caption, TQWidget* parent = 0, const char* name = 0); TQString preAction() const { return mActions->preAction(); } TQString postAction() const { return mActions->postAction(); } void setReadOnly(bool ro) { mActions->setReadOnly(ro); } diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index 64a247c7d..fa176f8b9 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -43,8 +43,8 @@ static const char TMPL_DIALOG_NAME[] = "TemplateDialog"; TemplateDlg* TemplateDlg::mInstance = 0; -TemplateDlg::TemplateDlg(TQWidget* tqparent, const char* name) - : KDialogBase(KDialogBase::Plain, i18n("Alarm Templates"), Close, Ok, tqparent, name, false, true) +TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) + : KDialogBase(KDialogBase::Plain, i18n("Alarm Templates"), Close, Ok, parent, name, false, true) { TQWidget* topWidget = plainPage(); TQBoxLayout* topLayout = new TQHBoxLayout(topWidget); @@ -103,11 +103,11 @@ TemplateDlg::~TemplateDlg() /****************************************************************************** * Create an instance, if none already exists. */ -TemplateDlg* TemplateDlg::create(TQWidget* tqparent, const char* name) +TemplateDlg* TemplateDlg::create(TQWidget* parent, const char* name) { if (mInstance) return 0; - mInstance = new TemplateDlg(tqparent, name); + mInstance = new TemplateDlg(parent, name); return mInstance; } @@ -138,9 +138,9 @@ void TemplateDlg::slotCopy() * Create a new template. * If 'event' is non-zero, base the new template on an existing event or template. */ -void TemplateDlg::createTemplate(const KAEvent* event, TQWidget* tqparent, TemplateListView* view) +void TemplateDlg::createTemplate(const KAEvent* event, TQWidget* parent, TemplateListView* view) { - EditAlarmDlg editDlg(true, i18n("New Alarm Template"), tqparent, 0, event); + EditAlarmDlg editDlg(true, i18n("New Alarm Template"), parent, 0, event); if (editDlg.exec() == TQDialog::Accepted) { KAEvent event; diff --git a/kalarm/templatedlg.h b/kalarm/templatedlg.h index 18ff7224c..7ea6fbef9 100644 --- a/kalarm/templatedlg.h +++ b/kalarm/templatedlg.h @@ -32,9 +32,9 @@ class TemplateDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - static TemplateDlg* create(TQWidget* tqparent = 0, const char* name = 0); + static TemplateDlg* create(TQWidget* parent = 0, const char* name = 0); ~TemplateDlg(); - static void createTemplate(const KAEvent* = 0, TQWidget* tqparent = 0, TemplateListView* = 0); + static void createTemplate(const KAEvent* = 0, TQWidget* parent = 0, TemplateListView* = 0); signals: void emptyToggled(bool notEmpty); @@ -50,7 +50,7 @@ class TemplateDlg : public KDialogBase void slotSelectionChanged(); private: - TemplateDlg(TQWidget* tqparent, const char* name); + TemplateDlg(TQWidget* parent, const char* name); static TemplateDlg* mInstance; // the current instance, to prevent multiple dialogues diff --git a/kalarm/templatelistview.cpp b/kalarm/templatelistview.cpp index 435789ce4..ac2852a7f 100644 --- a/kalarm/templatelistview.cpp +++ b/kalarm/templatelistview.cpp @@ -35,8 +35,8 @@ TQValueList<EventListViewBase*> TemplateListView::mInstanceList; -TemplateListView::TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* tqparent, const char* name) - : EventListViewBase(tqparent, name), +TemplateListView::TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent, const char* name) + : EventListViewBase(parent, name), mWhatsThisText(whatsThisText), mIconColumn(0), mNameColumn(1), @@ -92,8 +92,8 @@ TQString TemplateListView::whatsThisText(int column) const = Contains the details of one alarm for display in the TemplateListView. =============================================================================*/ -TemplateListViewItem::TemplateListViewItem(TemplateListView* tqparent, const KAEvent& event) - : EventListViewItemBase(tqparent, event) +TemplateListViewItem::TemplateListViewItem(TemplateListView* parent, const KAEvent& event) + : EventListViewItemBase(parent, event) { setLastColumnText(); // set the template name column text diff --git a/kalarm/templatelistview.h b/kalarm/templatelistview.h index 512b1ad91..0ac98dea8 100644 --- a/kalarm/templatelistview.h +++ b/kalarm/templatelistview.h @@ -34,7 +34,7 @@ class TemplateListView; class TemplateListViewItem : public EventListViewItemBase { public: - TemplateListViewItem(TemplateListView* tqparent, const KAEvent&); + TemplateListViewItem(TemplateListView* parent, const KAEvent&); TemplateListView* templateListView() const { return (TemplateListView*)listView(); } // Overridden base class methods TemplateListViewItem* nextSibling() const { return (TemplateListViewItem*)TQListViewItem::nextSibling(); } @@ -51,7 +51,7 @@ class TemplateListView : public EventListViewBase Q_OBJECT TQ_OBJECT public: - explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* tqparent = 0, const char* name = 0); + explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent = 0, const char* name = 0); ~TemplateListView(); int iconColumn() const { return mIconColumn; } int nameColumn() const { return mNameColumn; } diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h index e32293690..3859a29a5 100644 --- a/kalarm/templatemenuaction.h +++ b/kalarm/templatemenuaction.h @@ -31,7 +31,7 @@ class TemplateMenuAction : public KActionMenu TQ_OBJECT public: TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver, - const char* slot, KActionCollection* tqparent, const char* name = 0); + const char* slot, KActionCollection* parent, const char* name = 0); signals: void selected(const KAEvent&); diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp index fd0a5ebf8..3df2d8dd7 100644 --- a/kalarm/templatepickdlg.cpp +++ b/kalarm/templatepickdlg.cpp @@ -34,8 +34,8 @@ static const char TMPL_PICK_DIALOG_NAME[] = "TemplatePickDialog"; -TemplatePickDlg::TemplatePickDlg(TQWidget* tqparent, const char* name) - : KDialogBase(KDialogBase::Plain, i18n("Choose Alarm Template"), Ok|Cancel, Ok, tqparent, name) +TemplatePickDlg::TemplatePickDlg(TQWidget* parent, const char* name) + : KDialogBase(KDialogBase::Plain, i18n("Choose Alarm Template"), Ok|Cancel, Ok, parent, name) { TQWidget* topWidget = plainPage(); TQBoxLayout* topLayout = new TQVBoxLayout(topWidget); diff --git a/kalarm/templatepickdlg.h b/kalarm/templatepickdlg.h index 7c99f6f35..4cbfc3d1a 100644 --- a/kalarm/templatepickdlg.h +++ b/kalarm/templatepickdlg.h @@ -31,7 +31,7 @@ class TemplatePickDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - TemplatePickDlg(TQWidget* tqparent = 0, const char* name = 0); + TemplatePickDlg(TQWidget* parent = 0, const char* name = 0); const KAEvent* selectedTemplate() const; protected: virtual void resizeEvent(TQResizeEvent*); diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp index 0c88d93c5..31e69d749 100644 --- a/kalarm/timeselector.cpp +++ b/kalarm/timeselector.cpp @@ -34,8 +34,8 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis, - const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* tqparent, const char* name) - : TQFrame(tqparent, name), + const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name) + : TQFrame(parent, name), mLabel(0), mReadOnly(false) { diff --git a/kalarm/timeselector.h b/kalarm/timeselector.h index 1508194c7..1e8304f95 100644 --- a/kalarm/timeselector.h +++ b/kalarm/timeselector.h @@ -34,7 +34,7 @@ class TimeSelector : public TQFrame TQ_OBJECT public: TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis, - const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* tqparent, const char* name = 0); + const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name = 0); bool isChecked() const; void setChecked(bool on); int minutes() const; diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 21efed812..906ff2cc5 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -53,7 +53,7 @@ class TrayTooltip : public TQToolTip { public: - TrayTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { } + TrayTooltip(TQWidget* parent) : TQToolTip(parent) { } virtual ~TrayTooltip() {} protected: virtual void maybeTip(const TQPoint&); @@ -71,9 +71,9 @@ struct TipItem = The KDE system tray window. =============================================================================*/ -TrayWindow::TrayWindow(MainWindow* tqparent, const char* name) - : KSystemTray((theApp()->wantRunInSystemTray() ? tqparent : 0), name), - mAssocMainWindow(tqparent) +TrayWindow::TrayWindow(MainWindow* parent, const char* name) + : KSystemTray((theApp()->wantRunInSystemTray() ? parent : 0), name), + mAssocMainWindow(parent) { kdDebug(5950) << "TrayWindow::TrayWindow()\n"; // Set up GUI icons @@ -316,7 +316,7 @@ void TrayWindow::removeWindow(MainWindow* win) /****************************************************************************** * Check whether the widget is in the system tray. * Note that it is only sometime AFTER the show event that the system tray -* becomes the widget's tqparent. So for a definitive status, call this method +* becomes the widget's parent. So for a definitive status, call this method * only after waiting a bit... * Reply = true if the widget is in the system tray, or its status can't be determined. * = false if it is not currently in the system tray. @@ -324,18 +324,18 @@ void TrayWindow::removeWindow(MainWindow* win) bool TrayWindow::inSystemTray() const { #ifdef HAVE_X11_HEADERS - Window xParent; // receives tqparent window + Window xParent; // receives parent window Window root; Window* tqchildren = 0; unsigned int ntqchildren; - // Find the X tqparent window of the widget. This is not the same as the TQt tqparent widget. + // Find the X parent window of the widget. This is not the same as the TQt parent widget. if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &tqchildren, &ntqchildren)) - return true; // error determining its tqparent X window + return true; // error determining its parent X window if (tqchildren) XFree(tqchildren); - // If it is in the system tray, the system tray window will be its X tqparent. - // Otherwise, the root window will be its X tqparent. + // If it is in the system tray, the system tray window will be its X parent. + // Otherwise, the root window will be its X parent. return xParent != root; #else return true; @@ -348,7 +348,7 @@ bool TrayWindow::inSystemTray() const */ void TrayTooltip::maybeTip(const TQPoint&) { - TrayWindow* tqparent = (TrayWindow*)parentWidget(); + TrayWindow* parent = (TrayWindow*)parentWidget(); TQString text; if (Daemon::monitoringAlarms()) text = kapp->aboutData()->programName(); @@ -356,6 +356,6 @@ void TrayTooltip::maybeTip(const TQPoint&) text = i18n("%1 - disabled").tqarg(kapp->aboutData()->programName()); kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl; if (Preferences::tooltipAlarmCount()) - tqparent->tooltipAlarmText(text); - tip(tqparent->rect(), text); + parent->tooltipAlarmText(text); + tip(parent->rect(), text); } diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h index 371082cc4..e1d9ff078 100644 --- a/kalarm/traywindow.h +++ b/kalarm/traywindow.h @@ -34,7 +34,7 @@ class TrayWindow : public KSystemTray Q_OBJECT TQ_OBJECT public: - TrayWindow(MainWindow* tqparent, const char* name = 0); + TrayWindow(MainWindow* parent, const char* name = 0); ~TrayWindow(); void removeWindow(MainWindow*); MainWindow* assocMainWindow() const { return mAssocMainWindow; } diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp index 4d951c17f..63168f45e 100644 --- a/kalarm/undo.cpp +++ b/kalarm/undo.cpp @@ -320,7 +320,7 @@ void Undo::removeRedos(const TQString& eventID) * Undo or redo a specified item. * Reply = true if success, or if the item no longer exists. */ -bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* tqparent, const TQString& action) +bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQString& action) { UndoItem::mRestoreError = UndoItem::ERR_NONE; UndoItem::mRestoreWarning = UndoItem::WARN_NONE; @@ -347,7 +347,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* tqparent, const TQ default: return true; } - KAlarm::displayKOrgUpdateError(tqparent, errcode, UndoItem::mRestoreWarningCount); + KAlarm::displayKOrgUpdateError(parent, errcode, UndoItem::mRestoreWarningCount); return true; } case UndoItem::ERR_NOT_FOUND: err = i18n("Alarm not found"); break; @@ -357,7 +357,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* tqparent, const TQ case UndoItem::ERR_PROG: err = i18n("Program error"); break; default: err = i18n("Unknown error"); break; } - KMessageBox::sorry(tqparent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err)); + KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err)); return false; } diff --git a/kalarm/undo.h b/kalarm/undo.h index 2bc2ca1e5..6ad5dd513 100644 --- a/kalarm/undo.h +++ b/kalarm/undo.h @@ -44,14 +44,14 @@ class Undo : public TQObject static void saveDeletes(const TQValueList<KAEvent>&); static void saveReactivate(const KAEvent&); static void saveReactivates(const TQValueList<KAEvent>&); - static bool undo(TQWidget* tqparent, const TQString& action) - { return undo(mUndoList.begin(), UNDO, tqparent, action); } - static bool undo(int id, TQWidget* tqparent, const TQString& action) - { return undo(findItem(id, UNDO), UNDO, tqparent, action); } - static bool redo(TQWidget* tqparent, const TQString& action) - { return undo(mRedoList.begin(), REDO, tqparent, action); } - static bool redo(int id, TQWidget* tqparent, const TQString& action) - { return undo(findItem(id, REDO), REDO, tqparent, action); } + static bool undo(TQWidget* parent, const TQString& action) + { return undo(mUndoList.begin(), UNDO, parent, action); } + static bool undo(int id, TQWidget* parent, const TQString& action) + { return undo(findItem(id, UNDO), UNDO, parent, action); } + static bool redo(TQWidget* parent, const TQString& action) + { return undo(mRedoList.begin(), REDO, parent, action); } + static bool redo(int id, TQWidget* parent, const TQString& action) + { return undo(findItem(id, REDO), REDO, parent, action); } static void clear(); static bool haveUndo() { return !mUndoList.isEmpty(); } static bool haveRedo() { return !mRedoList.isEmpty(); } @@ -76,9 +76,9 @@ class Undo : public TQObject private: typedef TQValueList<UndoItem*>::Iterator Iterator; - Undo(TQObject* tqparent) : TQObject(tqparent) { } + Undo(TQObject* parent) : TQObject(parent) { } static void removeRedos(const TQString& eventID); - static bool undo(Iterator, Type, TQWidget* tqparent, const TQString& action); + static bool undo(Iterator, Type, TQWidget* parent, const TQString& action); static UndoItem* getItem(int id, Type); static Iterator findItem(int id, Type); void emitChanged(const TQString& undo, const TQString& redo) diff --git a/kandy/src/cmdpropertiesdialog.cpp b/kandy/src/cmdpropertiesdialog.cpp index b71a62f2f..3e72754f4 100644 --- a/kandy/src/cmdpropertiesdialog.cpp +++ b/kandy/src/cmdpropertiesdialog.cpp @@ -36,8 +36,8 @@ class ParameterItem : public TQCheckListItem { public: - ParameterItem(ATParameter *p,TQListView *tqparent) : - TQCheckListItem(tqparent,p->name(),CheckBox),mParameter(p) + ParameterItem(ATParameter *p,TQListView *parent) : + TQCheckListItem(parent,p->name(),CheckBox),mParameter(p) { setText(1,p->value()); setOn(p->userInput()); @@ -56,16 +56,16 @@ class ParameterItem : public TQCheckListItem { /* - * Constructs a CmdPropertiesDialog which is a child of 'tqparent', with the + * Constructs a CmdPropertiesDialog which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -CmdPropertiesDialog::CmdPropertiesDialog(ATCommand *cmd, TQWidget* tqparent, +CmdPropertiesDialog::CmdPropertiesDialog(ATCommand *cmd, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : CmdPropertiesDialog_base( tqparent, name, modal, fl ) + : CmdPropertiesDialog_base( parent, name, modal, fl ) { mCmd = cmd; diff --git a/kandy/src/cmdpropertiesdialog.h b/kandy/src/cmdpropertiesdialog.h index 052425153..9edf76c92 100644 --- a/kandy/src/cmdpropertiesdialog.h +++ b/kandy/src/cmdpropertiesdialog.h @@ -33,7 +33,7 @@ class CmdPropertiesDialog : public CmdPropertiesDialog_base Q_OBJECT TQ_OBJECT public: - CmdPropertiesDialog(ATCommand *cmd,TQWidget* tqparent=0,const char* name=0, + CmdPropertiesDialog(ATCommand *cmd,TQWidget* parent=0,const char* name=0, bool modal=false,WFlags fl=0); ~CmdPropertiesDialog(); diff --git a/kandy/src/commanditem.cpp b/kandy/src/commanditem.cpp index f8eceb2c9..9586abbd2 100644 --- a/kandy/src/commanditem.cpp +++ b/kandy/src/commanditem.cpp @@ -70,13 +70,13 @@ void CommandItem::load(TQDomElement *c) setItemText(); } -void CommandItem::save(TQDomDocument *doc,TQDomElement *tqparent) +void CommandItem::save(TQDomDocument *doc,TQDomElement *parent) { TQDomElement c = doc->createElement("command"); c.setAttribute("name",mCommand->cmdName()); c.setAttribute("string",mCommand->cmdString()); c.setAttribute("hexoutput",mCommand->hexOutput() ? "y" : "n"); - tqparent->appendChild(c); + parent->appendChild(c); TQPtrList<ATParameter> paras = mCommand->parameters(); for(uint i=0;i<paras.count();++i) { @@ -85,13 +85,13 @@ void CommandItem::save(TQDomDocument *doc,TQDomElement *tqparent) } void CommandItem::saveParameter(ATParameter *p, TQDomDocument *doc, - TQDomElement *tqparent) + TQDomElement *parent) { TQDomElement e = doc->createElement("parameter"); e.setAttribute("name",p->name()); e.setAttribute("value",p->value()); e.setAttribute("userinput",p->userInput() ? "y" : "n"); - tqparent->appendChild(e); + parent->appendChild(e); } void CommandItem::setItemText() diff --git a/kandy/src/commanditem.h b/kandy/src/commanditem.h index d92c9e744..46a648dd1 100644 --- a/kandy/src/commanditem.h +++ b/kandy/src/commanditem.h @@ -43,12 +43,12 @@ class CommandItem : public TQListViewItem { ATCommand *command(); void load(TQDomElement *c); - void save(TQDomDocument *doc,TQDomElement *tqparent); + void save(TQDomDocument *doc,TQDomElement *parent); void setItemText(); protected: - void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *tqparent); + void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *parent); private: ATCommand *mCommand; diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp index 3a1001ed3..076582140 100644 --- a/kandy/src/commandscheduler.cpp +++ b/kandy/src/commandscheduler.cpp @@ -30,9 +30,9 @@ #include "commandscheduler.h" #include "commandscheduler.moc" -CommandScheduler::CommandScheduler(Modem *modem,TQObject *tqparent, +CommandScheduler::CommandScheduler(Modem *modem,TQObject *parent, const char *name) : - TQObject(tqparent,name), + TQObject(parent,name), mModem(modem) { connect(mModem,TQT_SIGNAL(gotLine(const char *)), diff --git a/kandy/src/commandscheduler.h b/kandy/src/commandscheduler.h index d18f82dc9..c99476bdc 100644 --- a/kandy/src/commandscheduler.h +++ b/kandy/src/commandscheduler.h @@ -36,7 +36,7 @@ class CommandScheduler : public TQObject { Q_OBJECT TQ_OBJECT public: - CommandScheduler (Modem *modem,TQObject *tqparent = 0, const char *name = 0); + CommandScheduler (Modem *modem,TQObject *parent = 0, const char *name = 0); void execute(const TQString &command); void execute(ATCommand *command); diff --git a/kandy/src/commandset.cpp b/kandy/src/commandset.cpp index d1bcc6316..e6e5d70f8 100644 --- a/kandy/src/commandset.cpp +++ b/kandy/src/commandset.cpp @@ -129,13 +129,13 @@ void CommandSet::loadCommand(ATCommand *command,TQDomElement *c) } void CommandSet::saveCommand(ATCommand *command,TQDomDocument *doc, - TQDomElement *tqparent) + TQDomElement *parent) { TQDomElement c = doc->createElement("command"); c.setAttribute("name",command->cmdName()); c.setAttribute("string",command->cmdString()); c.setAttribute("hexoutput",command->hexOutput() ? "y" : "n"); - tqparent->appendChild(c); + parent->appendChild(c); TQPtrList<ATParameter> paras = command->parameters(); for(uint i=0;i<paras.count();++i) { @@ -144,11 +144,11 @@ void CommandSet::saveCommand(ATCommand *command,TQDomDocument *doc, } void CommandSet::saveParameter(ATParameter *p, TQDomDocument *doc, - TQDomElement *tqparent) + TQDomElement *parent) { TQDomElement e = doc->createElement("parameter"); e.setAttribute("name",p->name()); e.setAttribute("value",p->value()); e.setAttribute("userinput",p->userInput() ? "y" : "n"); - tqparent->appendChild(e); + parent->appendChild(e); } diff --git a/kandy/src/commandset.h b/kandy/src/commandset.h index d297fe630..586542330 100644 --- a/kandy/src/commandset.h +++ b/kandy/src/commandset.h @@ -51,8 +51,8 @@ class CommandSet { protected: void loadCommand(ATCommand *,TQDomElement *c); - void saveCommand(ATCommand *,TQDomDocument *doc,TQDomElement *tqparent); - void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *tqparent); + void saveCommand(ATCommand *,TQDomDocument *doc,TQDomElement *parent); + void saveParameter(ATParameter *p, TQDomDocument *doc,TQDomElement *parent); private: TQPtrList<ATCommand> mList; diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index 1e233aaa8..1bb03eb1a 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -54,8 +54,8 @@ #include "kandyprefsdialog.moc" -KandyPrefsDialog::KandyPrefsDialog(TQWidget *tqparent, char *name, bool modal) : - KPrefsDialog(KandyPrefs::self(),tqparent,name,modal) +KandyPrefsDialog::KandyPrefsDialog(TQWidget *parent, char *name, bool modal) : + KPrefsDialog(KandyPrefs::self(),parent,name,modal) { setupSerialTab(); setupAddressbookTab(); diff --git a/kandy/src/kandyprefsdialog.h b/kandy/src/kandyprefsdialog.h index 886e35048..4e367fafa 100644 --- a/kandy/src/kandyprefsdialog.h +++ b/kandy/src/kandyprefsdialog.h @@ -45,7 +45,7 @@ class KandyPrefsDialog : public KPrefsDialog TQ_OBJECT public: /** Initialize dialog and pages */ - KandyPrefsDialog(TQWidget *tqparent=0,char *name=0,bool modal=false); + KandyPrefsDialog(TQWidget *parent=0,char *name=0,bool modal=false); ~KandyPrefsDialog(); protected: diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index 6e76235be..d47f5bcb7 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -57,8 +57,8 @@ #include "kandyview.h" #include "kandyview.moc" -KandyView::KandyView(CommandScheduler *scheduler,TQWidget *tqparent) - : TQWidget(tqparent) +KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent) + : TQWidget(parent) { mModified = false; mScheduler = scheduler; diff --git a/kandy/src/kandyview.h b/kandy/src/kandyview.h index 41153a54f..8547dbf4c 100644 --- a/kandy/src/kandyview.h +++ b/kandy/src/kandyview.h @@ -56,7 +56,7 @@ class KandyView : public TQWidget /** * Default constructor */ - KandyView(CommandScheduler *,TQWidget *tqparent); + KandyView(CommandScheduler *,TQWidget *parent); /** * Destructor diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp index 08cf54cc7..70d0656f3 100644 --- a/kandy/src/mobilegui.cpp +++ b/kandy/src/mobilegui.cpp @@ -176,21 +176,21 @@ class PhoneBookItem : public TQCheckListItem /* - * Constructs a MobileGui which is a child of 'tqparent', with the + * Constructs a MobileGui which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ MobileGui::MobileGui( CommandScheduler *scheduler, KandyPrefs *kprefs, - TQWidget* tqparent, const char* name, WFlags fl ) : - DCOPObject( "KandyIface" ), MobileGui_base( tqparent, name, fl ) + TQWidget* parent, const char* name, WFlags fl ) : + DCOPObject( "KandyIface" ), MobileGui_base( parent, name, fl ) { // Setup links to related classes mScheduler = scheduler; mSyncer = new AddressSyncer; mPrefs = kprefs; - mtqparent = tqparent; + mparent = parent; // Setup mobile phone specific data mMobManufacturer = ""; @@ -1463,7 +1463,7 @@ void MobileGui::toggleConnection() setKabState( UNLOADED ); setMobState( UNLOADED ); - ((MobileMain *) mtqparent)->statusBar()->changeItem( i18n(" Connected "), 1 ); + ((MobileMain *) mparent)->statusBar()->changeItem( i18n(" Connected "), 1 ); } else { warnKabState( UNLOADED ); @@ -1510,7 +1510,7 @@ void MobileGui::disconnectGUI() mPBIndexOccupied.resize( 0, false ); - ((MobileMain *) mtqparent)->statusBar()->changeItem( i18n(" Disconnected "), + ((MobileMain *) mparent)->statusBar()->changeItem( i18n(" Disconnected "), 1 ); } diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h index cb28f1885..b8bfeba26 100644 --- a/kandy/src/mobilegui.h +++ b/kandy/src/mobilegui.h @@ -42,7 +42,7 @@ class MobileGui : public MobileGui_base, virtual public KandyIface TQ_OBJECT public: - MobileGui( CommandScheduler *, KandyPrefs *kprefs, TQWidget* tqparent=0, + MobileGui( CommandScheduler *, KandyPrefs *kprefs, TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~MobileGui(); @@ -80,7 +80,7 @@ class MobileGui : public MobileGui_base, virtual public KandyIface CommandScheduler *mScheduler; AddressSyncer *mSyncer; KandyPrefs *mPrefs; - TQWidget *mtqparent; + TQWidget *mparent; /* String Formatting Routines */ TQString quote( const TQString & ); diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp index 113f2e4bc..3956376a8 100644 --- a/kandy/src/modem.cpp +++ b/kandy/src/modem.cpp @@ -74,8 +74,8 @@ -Modem::Modem( KandyPrefs *kprefs, TQObject *tqparent, const char *name ) : - TQObject(tqparent, name) +Modem::Modem( KandyPrefs *kprefs, TQObject *parent, const char *name ) : + TQObject(parent, name) { mOpen = false; diff --git a/kandy/src/modem.h b/kandy/src/modem.h index 0b30a05bf..5c8521c13 100644 --- a/kandy/src/modem.h +++ b/kandy/src/modem.h @@ -48,7 +48,7 @@ class Modem : public TQObject Q_OBJECT TQ_OBJECT public: - Modem(KandyPrefs *kprefs, TQObject *tqparent = 0, const char *name = 0); + Modem(KandyPrefs *kprefs, TQObject *parent = 0, const char *name = 0); virtual ~Modem(); void setSpeed(int speed); diff --git a/karm/csvexportdialog.cpp b/karm/csvexportdialog.cpp index 7cb7774ff..f1e0fce66 100644 --- a/karm/csvexportdialog.cpp +++ b/karm/csvexportdialog.cpp @@ -33,10 +33,10 @@ #include "reportcriteria.h" CSVExportDialog::CSVExportDialog( ReportCriteria::REPORTTYPE rt, - TQWidget *tqparent, + TQWidget *parent, const char *name ) - : CSVExportDialogBase( tqparent, name ) + : CSVExportDialogBase( parent, name ) { switch ( rt ) { case ReportCriteria::CSVTotalsExport: diff --git a/karm/csvexportdialog.h b/karm/csvexportdialog.h index 51aaf3bd6..8e4966b5a 100644 --- a/karm/csvexportdialog.h +++ b/karm/csvexportdialog.h @@ -31,7 +31,7 @@ class CSVExportDialog : public CSVExportDialogBase public: CSVExportDialog( ReportCriteria::REPORTTYPE rt, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0 ); diff --git a/karm/doc/design b/karm/doc/design index fe37a3002..b647f2822 100644 --- a/karm/doc/design +++ b/karm/doc/design @@ -35,24 +35,24 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote: > > Id Description > > --------------------------------------------------------------------- > > 1 Karm shall provide a hierarchical structure of tasks. If a task -> > has at least one subtask it will be referred to as a tqparent task. +> > has at least one subtask it will be referred to as a parent task. > > If a task has no tqchildren it will be referred to as a leaf task. -> > If a task has no tqparent tasks it will be referred to as a root +> > If a task has no parent tasks it will be referred to as a root > > task. > > 2 A new task can be created as a child of any existing task. -> > 2.1 If the tqparent had a timer active, it will continue to be active +> > 2.1 If the parent had a timer active, it will continue to be active > > It depends on how you start it. If you double click it. Any other timer > will be stopped and the new task started. If you start it through the > start button, both tasks will be active. This a bug IMO. See at the bottom > for my proposal. > -> > 2.2 The session time for the tqparent will not be changed by adding +> > 2.2 The session time for the parent will not be changed by adding > > the new child task. -> > 2.3 The total time for the tqparent will not be changed by adding a +> > 2.3 The total time for the parent will not be changed by adding a > > the new child task. -> > 3 Any task (tqparent, leaf, or root) may have an independent timer. -> > 4 The time (both session and total) for a tqparent will be the sum +> > 3 Any task (parent, leaf, or root) may have an independent timer. +> > 4 The time (both session and total) for a parent will be the sum > > of its independent timer and the sum of all of its child timers. > > > > Unstable Development @@ -62,21 +62,21 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote: > > Id Description > > --------------------------------------------------------------------- > > 1 Karm shall provide a hierarchical structure of tasks. If a task -> > has at least one subtask it will be referred to as a tqparent task. +> > has at least one subtask it will be referred to as a parent task. > > If a task has no tqchildren it will be referred to as a leaf task. -> > If a task has no tqparent tasks it will be referred to as a root +> > If a task has no parent tasks it will be referred to as a root > > task. > > 2 A new task can be created as a child of any existing task. -> > 2.1 If the tqparent had a timer active, it will be deactivated -> > 2.2 The session time for the tqparent will set to zero +> > 2.1 If the parent had a timer active, it will be deactivated +> > 2.2 The session time for the parent will set to zero > > 2.2.1 The session time for the child will be initialized to the last -> > session time of the tqparent. -> > 2.3 The total time for the tqparent will be set to zero. -> > 2.3.1 The total time for the tqparent will be initialized to the last -> > total time of the tqparent. -> > 3 Only a leaf task may have a timer. A tqparent may not have its own +> > session time of the parent. +> > 2.3 The total time for the parent will be set to zero. +> > 2.3.1 The total time for the parent will be initialized to the last +> > total time of the parent. +> > 3 Only a leaf task may have a timer. A parent may not have its own > > timer. -> > 4 The time (both session and total) for a tqparent will be the sum +> > 4 The time (both session and total) for a parent will be the sum > > only of its child timers. > > I see where you want to go, but I think it's not the right direction for @@ -134,7 +134,7 @@ idea but can't quite see how the interface should work. Ok. So, I'll undo the changes related to: * summing only leaf tasks -* disallowing edits on tqparent tasks +* disallowing edits on parent tasks _______________________________________________ kde-pim mailing list kde-pim@mail.kde.org diff --git a/karm/doc/updating_parents.html b/karm/doc/updating_parents.html index 63587952f..3b55ce30f 100644 --- a/karm/doc/updating_parents.html +++ b/karm/doc/updating_parents.html @@ -34,6 +34,6 @@ You should get something like this.</p> <tr><td> </td> <td>Session: 3</td> <td>Total: 18</td></tr> </table> -<p>Since a tqparent task can have a timer active on it, it needs to be included in the summary +<p>Since a parent task can have a timer active on it, it needs to be included in the summary Session and Total times. So, in this example, the Session time will jump three minutes for every minute the timer is active.</p> diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp index 8c1651546..c91f13eaf 100644 --- a/karm/edittaskdialog.cpp +++ b/karm/edittaskdialog.cpp @@ -201,7 +201,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, } enableDesktops = true; } - // if some desktops were specified, then enable the tqparent box + // if some desktops were specified, then enable the parent box _desktopCB->setChecked(enableDesktops); for (int i=0; i<desktopCount; i++) diff --git a/karm/kaccelmenuwatch.cpp b/karm/kaccelmenuwatch.cpp index 75e4854e7..ddabb1d86 100644 --- a/karm/kaccelmenuwatch.cpp +++ b/karm/kaccelmenuwatch.cpp @@ -9,8 +9,8 @@ #include "kaccelmenuwatch.h" -KAccelMenuWatch::KAccelMenuWatch( KAccel *accel, TQObject *tqparent ) - : TQObject( tqparent ), +KAccelMenuWatch::KAccelMenuWatch( KAccel *accel, TQObject *parent ) + : TQObject( parent ), _accel( accel ), _menu ( 0 ) { diff --git a/karm/kaccelmenuwatch.h b/karm/kaccelmenuwatch.h index 4b9c3058b..a9956d08e 100644 --- a/karm/kaccelmenuwatch.h +++ b/karm/kaccelmenuwatch.h @@ -64,7 +64,7 @@ class KAccelMenuWatch : public TQObject /** * KAccelMenuWatch Constructor */ - KAccelMenuWatch( KAccel *accel, TQObject *tqparent = 0 ); + KAccelMenuWatch( KAccel *accel, TQObject *parent = 0 ); /** * KAccelMenuWatch Destructor diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index dca3cf94e..db6204491 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -22,8 +22,8 @@ #include "mainwindow.h" karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name ) - : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(tqparent, name), + TQObject *parent, const char *name ) + : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), _accel ( new KAccel( parentWidget ) ), _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) ) { @@ -312,7 +312,7 @@ void karmPart::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our tqparent to do it's thing + // in any event, we want our parent to do it's thing ReadWritePart::setModified(modified); } @@ -388,11 +388,11 @@ karmPartFactory::~karmPartFactory() } KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { // Create an instance of our Part - karmPart* obj = new karmPart( parentWidget, widgetName, tqparent, name ); + karmPart* obj = new karmPart( parentWidget, widgetName, parent, 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 8550cc9b3..7c679ee68 100644 --- a/karm/karm_part.h +++ b/karm/karm_part.h @@ -60,7 +60,7 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface public: karmPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name); + TQObject *parent, const char *name); // DCOP void quit(); virtual bool save(); @@ -127,7 +127,7 @@ public: karmPartFactory(); virtual ~karmPartFactory(); virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/karm/karmdcopiface.h b/karm/karmdcopiface.h index 67e599383..7233ff25f 100644 --- a/karm/karmdcopiface.h +++ b/karm/karmdcopiface.h @@ -38,7 +38,7 @@ class KarmDCOPIface : virtual public DCOPObject /** * Add a new top-level task. * - * A top-level task is one that has no tqparent tasks. + * A top-level task is one that has no parent tasks. * * @param taskName Name of new task. * diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 1231113b6..1e4f92a1f 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -156,7 +156,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt TQDict< Task > map; // Build dictionary to look up Task object from Todo uid. Each task is a - // TQListViewItem, and is initially added with the view as the tqparent. + // TQListViewItem, and is initially added with the view as the parent. todoList = _calendar->rawTodos(); kdDebug(5970) << "KarmStorage::load " << "rawTodo count (includes completed todos) =" @@ -186,7 +186,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt task->setPixmapProgress(); } - // Load each task under it's tqparent task. + // Load each task under it's parent task. for( todo = todoList.begin(); todo != todoList.end(); ++todo ) { Task* task = map.find( (*todo)->uid() ); @@ -198,7 +198,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt // Complete the loading but return a message if ( !newParent ) - err = i18n("Error loading \"%1\": could not find tqparent (uid=%2)") + err = i18n("Error loading \"%1\": could not find parent (uid=%2)") .tqarg(task->name()) .tqarg((*todo)->relatedToUid()); @@ -245,7 +245,7 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view) // 1. insert tasks form rc into taskview // 1.1. Build dictionary to look up Task object from Todo uid. Each task is a - // TQListViewItem, and is initially added with the view as the tqparent. + // TQListViewItem, and is initially added with the view as the parent. todoList = rc->rawTodos(); for( todo = todoList.begin(); todo != todoList.end(); ++todo ) { @@ -255,7 +255,7 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view) task->setPixmapProgress(); } - // 1.1. Load each task under it's tqparent task. + // 1.1. Load each task under it's parent task. for( todo = todoList.begin(); todo != todoList.end(); ++todo ) { Task* task = map.find( (*todo)->uid() ); @@ -267,7 +267,7 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view) // Complete the loading but return a message if ( !newParent ) - err = i18n("Error loading \"%1\": could not find tqparent (uid=%2)") + err = i18n("Error loading \"%1\": could not find parent (uid=%2)") .tqarg(task->name()) .tqarg((*todo)->relatedToUid()); @@ -439,17 +439,17 @@ TQString KarmStorage::loadFromFlatFile(TaskView* taskview, task->setUid(addTask(task, 0)); } else { - Task *tqparent = stack.top(); + Task *parent = stack.top(); kdDebug(5970) << "KarmStorage::loadFromFlatFile - task: " << name - << " min: " << minutes << " tqparent" << tqparent->name() << "\n"; - task = new Task(name, minutes, 0, desktopList, tqparent); + << " min: " << minutes << " parent" << parent->name() << "\n"; + task = new Task(name, minutes, 0, desktopList, parent); - task->setUid(addTask(task, tqparent)); + task->setUid(addTask(task, parent)); // Legacy File Format (!): - tqparent->changeTimes(0, -minutes); + parent->changeTimes(0, -minutes); taskview->setRootIsDecorated(true); - tqparent->setOpen(true); + parent->setOpen(true); } if (!task->uid().isNull()) stack.push(task); @@ -556,12 +556,12 @@ bool KarmStorage::parseLine(TQString line, long *time, TQString *name, void KarmStorage::adjustFromLegacyFileFormat(Task* task) { - // unless the tqparent is the listView - if ( task->tqparent() ) - task->tqparent()->changeTimes(-task->sessionTime(), -task->time()); + // unless the parent is the listView + if ( task->parent() ) + task->parent()->changeTimes(-task->sessionTime(), -task->time()); // traverse depth first - - // as soon as we're in a leaf, we'll substract it's time from the tqparent + // as soon as we're in a leaf, we'll substract it's time from the parent // then, while descending back we'll do the same for each node untill // we reach the root for ( Task* subtask = task->firstChild(); subtask; @@ -701,7 +701,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, // public routines: // -TQString KarmStorage::addTask(const Task* task, const Task* tqparent) +TQString KarmStorage::addTask(const Task* task, const Task* parent) { KCal::Todo* todo; TQString uid; @@ -710,8 +710,8 @@ TQString KarmStorage::addTask(const Task* task, const Task* tqparent) if ( _calendar->addTodo( todo ) ) { task->asTodo( todo ); - if (tqparent) - todo->setRelatedTo(_calendar->todo(tqparent->uid())); + if (parent) + todo->setRelatedTo(_calendar->todo(parent->uid())); uid = todo->uid(); } else diff --git a/karm/karmstorage.h b/karm/karmstorage.h index 40c574d7f..65caafd7c 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -132,7 +132,7 @@ class KarmStorage * Read tasks and their total times from a text file (legacy storage). * * This reads from one of the two legacy file formats. In this version, - * the tqparent task times do not include the sum of all their tqchildren's + * the parent task times do not include the sum of all their tqchildren's * times. * * The format of the file is zero or more lines of: @@ -266,15 +266,15 @@ class KarmStorage * Add this task from iCalendar file. * * Create a new KCal::Todo object and load with task information. If - * tqparent is not zero, then set the RELATED-TO attribute for this Todo. + * parent is not zero, then set the RELATED-TO attribute for this Todo. * * @param task The task to be removed. - * @param tqparent The tqparent of this task. Must have a uid() that is in + * @param parent The parent of this task. Must have a uid() that is in * the existing calendar. If zero, this task is considered a root task. * @return The unique ID for the new VTODO. Return an null TQString if * there was an error creating the new calendar object. */ - TQString addTask(const Task* task, const Task* tqparent); + TQString addTask(const Task* task, const Task* parent); /** * Check if the iCalendar file currently loaded has any Todos in it. diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp index e480dea40..2eaf32b20 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -16,8 +16,8 @@ enum ValidatorType { HOUR, MINUTE }; class TimeValidator : public TQValidator { public: - TimeValidator( ValidatorType tp, TQWidget *tqparent=0, const char *name=0) - : TQValidator(TQT_TQOBJECT(tqparent), name) + TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0) + : TQValidator(TQT_TQOBJECT(parent), name) { _tp = tp; } @@ -46,8 +46,8 @@ class KarmLineEdit : public TQLineEdit { public: - KarmLineEdit( TQWidget* tqparent, const char* name = 0 ) - : TQLineEdit( tqparent, name ) {} + KarmLineEdit( TQWidget* parent, const char* name = 0 ) + : TQLineEdit( parent, name ) {} protected: @@ -60,8 +60,8 @@ protected: }; -KArmTimeWidget::KArmTimeWidget( TQWidget* tqparent, const char* name ) - : TQWidget(tqparent, name) +KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name ) + : TQWidget(parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); diff --git a/karm/ktimewidget.h b/karm/ktimewidget.h index 62f81f77c..88f298b22 100644 --- a/karm/ktimewidget.h +++ b/karm/ktimewidget.h @@ -13,7 +13,7 @@ class KarmLineEdit; class KArmTimeWidget : public TQWidget { public: - KArmTimeWidget( TQWidget* tqparent = 0, const char* name = 0 ); + KArmTimeWidget( TQWidget* parent = 0, const char* name = 0 ); void setTime( long minutes ); long time() const; diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp index b205fd7af..7ac13a5e3 100644 --- a/karm/plannerparser.cpp +++ b/karm/plannerparser.cpp @@ -35,9 +35,9 @@ test cases: kdDebug() << "entering constructor to import planner tasks" << endl; _taskView=tv; level=0; - if (_taskView->current_item()) if (_taskView->current_item()->tqparent()) + if (_taskView->current_item()) if (_taskView->current_item()->parent()) { - task = _taskView->current_item()->tqparent(); + task = _taskView->current_item()->parent(); level=1; } } @@ -92,7 +92,7 @@ test cases: // only <task>s within <tasks> increased level, so only decrease for <task>s within <tasks> if (withInTasks) { - if (qName=="task") if (level-->=0) task=task->tqparent(); + if (qName=="task") if (level-->=0) task=task->parent(); if (qName=="tasks") withInTasks=false; } return true; diff --git a/karm/task.cpp b/karm/task.cpp index cf37ee43a..03eb1d3b2 100644 --- a/karm/task.cpp +++ b/karm/task.cpp @@ -22,21 +22,21 @@ const int gSecondsPerMinute = 60; TQPtrVector<TQPixmap> *Task::icons = 0; Task::Task( const TQString& taskName, long minutes, long sessionTime, - DesktopList desktops, TaskView *tqparent) - : TQObject(), TQListViewItem(tqparent) + DesktopList desktops, TaskView *parent) + : TQObject(), TQListViewItem(parent) { init(taskName, minutes, sessionTime, desktops, 0); } Task::Task( const TQString& taskName, long minutes, long sessionTime, - DesktopList desktops, Task *tqparent) - : TQObject(), TQListViewItem(tqparent) + DesktopList desktops, Task *parent) + : TQObject(), TQListViewItem(parent) { init(taskName, minutes, sessionTime, desktops, 0); } -Task::Task( KCal::Todo* todo, TaskView* tqparent ) - : TQObject(), TQListViewItem( tqparent ) +Task::Task( KCal::Todo* todo, TaskView* parent ) + : TQObject(), TQListViewItem( parent ) { long minutes = 0; TQString name; @@ -51,9 +51,9 @@ Task::Task( KCal::Todo* todo, TaskView* tqparent ) void Task::init( const TQString& taskName, long minutes, long sessionTime, DesktopList desktops, int percent_complete) { - // If our tqparent is the taskview then connect our totalTimesChanged + // If our parent is the taskview then connect our totalTimesChanged // signal to its receiver - if ( ! tqparent() ) + if ( ! parent() ) connect( this, TQT_SIGNAL( totalTimesChanged ( long, long ) ), listView(), TQT_SLOT( taskTotalTimesChanged( long, long) )); @@ -164,13 +164,13 @@ void Task::setPercentComplete(const int percent, KarmStorage *storage) setPixmapProgress(); - // When tqparent marked as complete, mark all tqchildren as complete as well. - // Complete tasks are not displayed in the task view, so if a tqparent is + // When parent marked as complete, mark all tqchildren as complete as well. + // Complete tasks are not displayed in the task view, so if a parent is // marked as complete and some of the tqchildren are not, then we get an error // message. KArm actually keep chugging along in this case and displays the // child tasks just fine, so an alternative solution is to remove that error // message (from KarmStorage::load). But I think it makes more sense that - // if you mark a tqparent task as complete, then all tqchildren should be + // if you mark a parent task as complete, then all tqchildren should be // complete as well. // // This behavior is consistent with KOrganizer (as of 2003-09-24). @@ -252,7 +252,7 @@ void Task::changeParentTotalTimes( long minutesSession, long minutes ) if ( isRoot() ) emit totalTimesChanged( minutesSession, minutes ); else - tqparent()->changeTotalTimes( minutesSession, minutes ); + parent()->changeTotalTimes( minutesSession, minutes ); } bool Task::remove( TQPtrList<Task>& activeTasks, KarmStorage* storage) @@ -290,7 +290,7 @@ TQString Task::fullName() const if (isRoot()) return name(); else - return tqparent()->fullName() + TQString::tqfromLatin1("/") + name(); + return parent()->fullName() + TQString::tqfromLatin1("/") + name(); } KCal::Todo* Task::asTodo(KCal::Todo* todo) const @@ -390,10 +390,10 @@ void Task::cut() { //kdDebug(5970) << "Task::cut - " << name() << endl; changeParentTotalTimes( -_totalSessionTime, -_totalTime); - if ( ! tqparent()) + if ( ! parent()) listView()->takeItem(this); else - tqparent()->takeItem(this); + parent()->takeItem(this); } void Task::move(Task* destination) diff --git a/karm/task.h b/karm/task.h index acf2cd998..53c7abcc9 100644 --- a/karm/task.h +++ b/karm/task.h @@ -46,20 +46,20 @@ class Task : public TQObject, public TQListViewItem public: //@{ constructors Task( const TQString& taskame, long minutes, long sessionTime, - DesktopList desktops, TaskView* tqparent = 0); + DesktopList desktops, TaskView* parent = 0); Task( const TQString& taskame, long minutes, long sessionTime, - DesktopList desktops, Task* tqparent = 0); - Task( KCal::Todo* incident, TaskView* tqparent ); + DesktopList desktops, Task* parent = 0); + Task( KCal::Todo* incident, TaskView* parent ); //@} /* destructor */ ~Task(); - /** return tqparent Task or null in case of TaskView. - * same as TQListViewItem::tqparent() + /** return parent Task or null in case of TaskView. + * same as TQListViewItem::parent() */ Task* firstChild() const { return (Task*)TQListViewItem::firstChild(); } Task* nextSibling() const { return (Task*)TQListViewItem::nextSibling(); } - Task* tqparent() const { return (Task*)TQListViewItem::tqparent(); } + Task* parent() const { return (Task*)TQListViewItem::parent(); } /** Return task view for this task */ TaskView* taskView() const { @@ -78,9 +78,9 @@ class Task : public TQObject, public TQListViewItem */ void setUid(const TQString uid); - /** cut Task out of tqparent Task or the TaskView */ + /** cut Task out of parent Task or the TaskView */ void cut(); - /** cut Task out of tqparent Task or the TaskView and into the + /** cut Task out of parent Task or the TaskView and into the * destination Task */ void move(Task* destination); /** insert Task into the destination Task */ @@ -162,7 +162,7 @@ class Task : public TQObject, public TQListViewItem TQString name() const { return _name; }; /** - * Returns that task name, prefixed by tqparent tree up to root. + * Returns that task name, prefixed by parent tree up to root. * * Task names are seperated by a forward slash: / */ @@ -206,7 +206,7 @@ class Task : public TQObject, public TQListViewItem TQString comment() const; /** tells you whether this task is the root of the task tree */ - bool isRoot() const { return tqparent() == 0; } + bool isRoot() const { return parent() == 0; } /** remove Task with all it's tqchildren * @param activeTasks - list of aktive tasks diff --git a/karm/taskview.cpp b/karm/taskview.cpp index 95dfc8569..b4f655ff9 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -37,7 +37,7 @@ class DesktopTracker; -TaskView::TaskView(TQWidget *tqparent, const char *name, const TQString &icsfile ):KListView(tqparent,name) +TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ):KListView(parent,name) { _preferences = Preferences::instance( icsfile ); _storage = KarmStorage::instance(); @@ -495,7 +495,7 @@ void TaskView::newTask() newTask(i18n("New Task"), 0); } -void TaskView::newTask(TQString caption, Task *tqparent) +void TaskView::newTask(TQString caption, Task *parent) { EditTaskDialog *dialog = new EditTaskDialog(caption, false); long total, totalDiff, session, sessionDiff; @@ -514,7 +514,7 @@ void TaskView::newTask(TQString caption, Task *tqparent) if ( desktopList.size() == ( unsigned int ) _desktopTracker->desktopCount() ) desktopList.clear(); - TQString uid = addTask( taskName, total, session, desktopList, tqparent ); + TQString uid = addTask( taskName, total, session, desktopList, parent ); if ( uid.isNull() ) { KMessageBox::error( 0, i18n( @@ -527,15 +527,15 @@ void TaskView::newTask(TQString caption, Task *tqparent) TQString TaskView::addTask ( const TQString& taskname, long total, long session, - const DesktopList& desktops, Task* tqparent ) + const DesktopList& desktops, Task* parent ) { Task *task; kdDebug(5970) << "TaskView::addTask: taskname = " << taskname << endl; - if ( tqparent ) task = new Task( taskname, total, session, desktops, tqparent ); + if ( parent ) task = new Task( taskname, total, session, desktops, parent ); else task = new Task( taskname, total, session, desktops, this ); - task->setUid( _storage->addTask( task, tqparent ) ); + task->setUid( _storage->addTask( task, parent ) ); TQString taskuid=task->uid(); if ( ! taskuid.isNull() ) { diff --git a/karm/taskview.h b/karm/taskview.h index 7b9bc4414..f1b22048f 100644 --- a/karm/taskview.h +++ b/karm/taskview.h @@ -45,7 +45,7 @@ class TaskView : public KListView TQ_OBJECT public: - TaskView( TQWidget *tqparent = 0, const char *name = 0, const TQString &icsfile = "" ); + TaskView( TQWidget *parent = 0, const char *name = 0, const TQString &icsfile = "" ); virtual ~TaskView(); /** Return the first item in the view, cast to a Task pointer. */ @@ -83,7 +83,7 @@ class TaskView : public KListView /** Add a task to view and storage. */ TQString addTask( const TQString& taskame, long total, long session, const DesktopList& desktops, - Task* tqparent = 0 ); + Task* parent = 0 ); public slots: /** Save to persistent storage. */ @@ -105,7 +105,7 @@ class TaskView : public KListView void newTask(); /** Display edit task dialog and create a new task with results. */ - void newTask( TQString caption, Task* tqparent ); + void newTask( TQString caption, Task* parent ); /** Used to refresh (e.g. after import) */ void refresh(); diff --git a/karm/tray.cpp b/karm/tray.cpp index 20486b4b7..20c2f51e6 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -30,8 +30,8 @@ TQPtrVector<TQPixmap> *KarmTray::icons = 0; -KarmTray::KarmTray(MainWindow* tqparent) - : KSystemTray(tqparent, "Karm Tray") +KarmTray::KarmTray(MainWindow* parent) + : KSystemTray(parent, "Karm Tray") { // the timer that updates the "running" icon in the tray _taskActiveTimer = new TQTimer(this); @@ -49,8 +49,8 @@ KarmTray::KarmTray(MainWindow* tqparent) } } - tqparent->actionPreferences->plug( contextMenu() ); - tqparent->actionStopAll->plug( contextMenu() ); + parent->actionPreferences->plug( contextMenu() ); + parent->actionStopAll->plug( contextMenu() ); resetClock(); initToolTip(); @@ -71,7 +71,7 @@ KarmTray::KarmTray(MainWindow* tqparent) */ } -KarmTray::KarmTray(karmPart * tqparent) +KarmTray::KarmTray(karmPart * parent) : KSystemTray( 0 , "Karm Tray") { // it is not convenient if every kpart gets an icon in the systray. diff --git a/karm/tray.h b/karm/tray.h index b299a6edb..d0fbd8ca2 100644 --- a/karm/tray.h +++ b/karm/tray.h @@ -27,8 +27,8 @@ class KarmTray : public KSystemTray TQ_OBJECT public: - KarmTray(MainWindow * tqparent); - KarmTray(karmPart * tqparent); + KarmTray(MainWindow * parent); + KarmTray(karmPart * parent); ~KarmTray(); private: diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index b863e4e6e..f11832f37 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -56,10 +56,10 @@ static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit ri KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o, - KDGanttMinimizeSplitter *tqparent, const char * name ) - : TQWidget( tqparent, name ), _activeButton( 0 ), _collapsed( false ) + KDGanttMinimizeSplitter *parent, const char * name ) + : TQWidget( parent, name ), _activeButton( 0 ), _collapsed( false ) { - s = tqparent; + s = parent; setOrientation(o); setMouseTracking( true ); } @@ -325,7 +325,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i To show a TQListBox, a TQListView and a TQTextEdit side by side: \code - KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( tqparent ); + KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( parent ); TQListBox *lb = new TQListBox( split ); TQListView *lv = new TQListView( split ); TQTextEdit *ed = new TQTextEdit( split ); @@ -378,22 +378,22 @@ static TQSize minSizeHint( const TQWidget* w ) /*! - Constructs a horizontal splitter with the \a tqparent and \a + Constructs a horizontal splitter with the \a parent and \a name arguments being passed on to the TQFrame constructor. */ -KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *tqparent, const char *name ) - :TQFrame(tqparent,name,WPaintUnclipped) +KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *parent, const char *name ) + :TQFrame(parent,name,WPaintUnclipped) { orient = Qt::Horizontal; init(); } /*! - Constructs a splitter with orientation \a o with the \a tqparent + Constructs a splitter with orientation \a o with the \a parent and \a name arguments being passed on to the TQFrame constructor. */ -KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *tqparent, const char *name ) - :TQFrame(tqparent,name,WPaintUnclipped) +KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *parent, const char *name ) + :TQFrame(parent,name,WPaintUnclipped) { orient = o; init(); diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index 9137da064..0d3499ac1 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -52,8 +52,8 @@ public: enum ResizeMode { Stretch, KeepSize, FollowSizeHint }; enum Direction { Left, Right, Up, Down }; - KDGanttMinimizeSplitter( TQWidget* tqparent=0, const char* name=0 ); - KDGanttMinimizeSplitter( Qt::Orientation, TQWidget* tqparent=0, const char* name=0 ); + KDGanttMinimizeSplitter( TQWidget* parent=0, const char* name=0 ); + KDGanttMinimizeSplitter( Qt::Orientation, TQWidget* parent=0, const char* name=0 ); ~KDGanttMinimizeSplitter(); virtual void setOrientation( Qt::Orientation ); @@ -141,7 +141,7 @@ class KDGanttSplitterHandle : public TQWidget TQ_OBJECT public: KDGanttSplitterHandle( Qt::Orientation o, - KDGanttMinimizeSplitter *tqparent, const char* name=0 ); + KDGanttMinimizeSplitter *parent, const char* name=0 ); void setOrientation( Qt::Orientation o ); Qt::Orientation orientation() const { return orient; } diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 08c1a004c..bfaa161d0 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -57,15 +57,15 @@ orientation and the control arrow button on top of the controlled widget. - \param tqparent the tqparent widget. This parameter is passed to the + \param parent the parent widget. This parameter is passed to the base class. \param name the internal widget name. This parameter is passed to the base class. */ -KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* tqparent, +KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent, const char* name ) : - KDGanttSizingControl( tqparent, name ), _orient( Qt::Horizontal ), + KDGanttSizingControl( parent, name ), _orient( Qt::Horizontal ), _arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0) { init(); @@ -78,16 +78,16 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* tqparent, the controlled widget (depending on the orientation). \param orientation the orientation of the splitter - \param tqparent the tqparent widget. This parameter is passed to the + \param parent the parent widget. This parameter is passed to the base class. \param name the internal widget name. This parameter is passed to the base class. */ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation, - TQWidget* tqparent, + TQWidget* parent, const char* name ) : - KDGanttSizingControl( tqparent, name ), _orient( orientation ), + KDGanttSizingControl( parent, name ), _orient( orientation ), _arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0) { init(); @@ -101,7 +101,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation, \param arrowPosition specifies whether the control arrow button should appear before or after the controlled widget \param orientation the orientation of the splitter - \param tqparent the tqparent widget. This parameter is passed to the + \param parent the parent widget. This parameter is passed to the base class. \param name the internal widget name. This parameter is passed to the base class. @@ -109,9 +109,9 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation, KDGanttSemiSizingControl::KDGanttSemiSizingControl( ArrowPosition arrowPosition, Qt::Orientation orientation, - TQWidget* tqparent, + TQWidget* parent, const char* name ) : - KDGanttSizingControl( tqparent, name ), _orient( orientation ), + KDGanttSizingControl( parent, name ), _orient( orientation ), _arrowPos( arrowPosition ), _minimizedWidget(0), _maximizedWidget(0) { init(); @@ -313,7 +313,7 @@ void KDGanttSemiSizingControl::setup() ************************************************** */ // hack for the usage in KDGantt as pop-up legend widget // for this purpose, - // the _maximizedWidget must be a child of the tqparent of this widget + // the _maximizedWidget must be a child of the parent of this widget if ( isMinimized() ) { widget = _minimizedWidget; diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h index 5857786e0..c1cc0b597 100644 --- a/kdgantt/KDGanttSemiSizingControl.h +++ b/kdgantt/KDGanttSemiSizingControl.h @@ -50,11 +50,11 @@ class KDGanttSemiSizingControl : public KDGanttSizingControl public: enum ArrowPosition { Before, After }; - KDGanttSemiSizingControl( TQWidget* tqparent = 0, const char* name = 0 ); - KDGanttSemiSizingControl( Qt::Orientation orientation, TQWidget* tqparent = 0, + KDGanttSemiSizingControl( TQWidget* parent = 0, const char* name = 0 ); + KDGanttSemiSizingControl( Qt::Orientation orientation, TQWidget* parent = 0, const char* name = 0 ); KDGanttSemiSizingControl( ArrowPosition arrowPosition, - Qt::Orientation orientation, TQWidget* tqparent = 0, + Qt::Orientation orientation, TQWidget* parent = 0, const char* name = 0 ); void setMinimizedWidget( TQWidget* widget ); diff --git a/kdgantt/KDGanttSizingControl.cpp b/kdgantt/KDGanttSizingControl.cpp index a51f9f4fe..3d174ad57 100644 --- a/kdgantt/KDGanttSizingControl.cpp +++ b/kdgantt/KDGanttSizingControl.cpp @@ -48,7 +48,7 @@ /*! Constructs an empty KDGanttSizing Control. - \param tqparent the tqparent widget. This parameter is passed to the + \param parent the parent widget. This parameter is passed to the base class. \param name the internal widget name. This parameter is passed to the base class. @@ -56,8 +56,8 @@ */ -KDGanttSizingControl::KDGanttSizingControl( TQWidget* tqparent, const char* name, WFlags f ) - :TQWidget( tqparent, name, f ), _isMinimized( false ) +KDGanttSizingControl::KDGanttSizingControl( TQWidget* parent, const char* name, WFlags f ) + :TQWidget( parent, name, f ), _isMinimized( false ) { } diff --git a/kdgantt/KDGanttSizingControl.h b/kdgantt/KDGanttSizingControl.h index cbea0c58b..ffdb0fa7d 100644 --- a/kdgantt/KDGanttSizingControl.h +++ b/kdgantt/KDGanttSizingControl.h @@ -44,7 +44,7 @@ public: bool isMinimized() const; protected: - KDGanttSizingControl( TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 ); + KDGanttSizingControl( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); public slots: virtual void minimize( bool minimize ); diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 749e53064..303ca8651 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -76,12 +76,12 @@ /*! Constructs an empty KDGanttView. - \param tqparent the widget tqparent + \param parent the widget parent \param name the internal debugging name */ -KDGanttView::KDGanttView( TQWidget* tqparent, const char* name ) - : KDGanttMinimizeSplitter( Qt::Vertical, tqparent, name ), +KDGanttView::KDGanttView( TQWidget* parent, const char* name ) + : KDGanttMinimizeSplitter( Qt::Vertical, parent, name ), myCanvasView(0), myTimeHeaderScroll(0), mFixedHorizon( false ) @@ -2346,7 +2346,7 @@ KDGanttViewItem* KDGanttView::firstChild() const GanttView as a calendar view, you have to call setDisplaySubitemsAsGroup( true ); to use the root items as calendar items. To create new calendar entries for these root items, create - a new KDGanttViewTaskItem with this root item as a tqparent. If you + a new KDGanttViewTaskItem with this root item as a parent. If you want an item with subitems to behave like a calendar (which is possibly empty at startup), please call setIsCalendar( true ); for this item. @@ -4542,7 +4542,7 @@ void KDGanttView::lvStartDrag (KDGanttViewItem* item) // In order to avoid starting drags for particular items, subclass KDGanttView // an reimplement this method. // insert here some code like - // if ( item->tqparent() ) + // if ( item->parent() ) // return; // This particular code will make it impossible to drag other items but root items. if ( d->drag() ) { diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h index 781cc7586..264b609c1 100644 --- a/kdgantt/KDGanttView.h +++ b/kdgantt/KDGanttView.h @@ -119,7 +119,7 @@ public: enum HourFormat { Hour_24, Hour_12, Hour_24_FourDigit }; enum RepaintMode { No, Medium, Always }; - KDGanttView( TQWidget* tqparent = 0, const char* name = 0 ); + KDGanttView( TQWidget* parent = 0, const char* name = 0 ); ~KDGanttView(); virtual void show(); diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp index 137c8ea3c..2d43a8e07 100644 --- a/kdgantt/KDGanttViewEventItem.cpp +++ b/kdgantt/KDGanttViewEventItem.cpp @@ -64,15 +64,15 @@ KDGanttViewEventItem::KDGanttViewEventItem( KDGanttView* view, /*! Constructs an empty Gantt item of type event. - \param tqparent a tqparent item under which this one goes + \param parent a parent 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 */ -KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* tqparent, +KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* parent, const TQString& lvtext, const TQString& name ) : - KDGanttViewItem( Event, tqparent, lvtext, name ) + KDGanttViewItem( Event, parent, lvtext, name ) { initItem(); @@ -102,17 +102,17 @@ KDGanttViewEventItem::KDGanttViewEventItem( KDGanttView* view, /*! Constructs an empty Gantt item of type event. - \param tqparent a tqparent item under which this one goes + \param parent a parent 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 */ -KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* tqparent, +KDGanttViewEventItem::KDGanttViewEventItem( KDGanttViewItem* parent, KDGanttViewItem* after, const TQString& lvtext, const TQString& name ) : - KDGanttViewItem( Event, tqparent, after, lvtext, name ) + KDGanttViewItem( Event, parent, after, lvtext, name ) { initItem(); diff --git a/kdgantt/KDGanttViewEventItem.h b/kdgantt/KDGanttViewEventItem.h index 033a248df..6bddf5a4d 100644 --- a/kdgantt/KDGanttViewEventItem.h +++ b/kdgantt/KDGanttViewEventItem.h @@ -43,13 +43,13 @@ public: KDGanttViewEventItem( KDGanttView* view, const TQString& lvtext = TQString(), const TQString& name = TQString() ); - KDGanttViewEventItem( KDGanttViewItem* tqparent, + KDGanttViewEventItem( KDGanttViewItem* parent, const TQString& lvtext = TQString(), const TQString& name = TQString() ); KDGanttViewEventItem( KDGanttView* view, KDGanttViewItem* after, const TQString& lvtext = TQString(), const TQString& name = TQString() ); - KDGanttViewEventItem( KDGanttViewItem* tqparent, KDGanttViewItem* after, + KDGanttViewEventItem( KDGanttViewItem* parent, KDGanttViewItem* after, const TQString& lvtext = TQString(), const TQString& name = TQString() ); virtual ~KDGanttViewEventItem(); diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp index 687618139..de80477a5 100644 --- a/kdgantt/KDGanttViewItem.cpp +++ b/kdgantt/KDGanttViewItem.cpp @@ -148,10 +148,10 @@ \a KDGanttView::setDisplaySubitemsAsGroup( true ); Insert root items in the Gantt view. Insert items as tqchildren of these root item in the Gantt view. - You may use any item type as tqparent and child; there are no limitations. + You may use any item type as parent and child; there are no limitations. It is, however, recommended to use KDGanttViewTaskItems Actually, you may add child items to the tqchildren themselves. - Such a child behaves then like a tqparent. + Such a child behaves then like a parent. Now set the start/end time of the tqchildren to specify a time interval for these items. */ @@ -182,7 +182,7 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view, Constructs an empty Gantt item. \param type the type of the item to insert - \param parentItem a tqparent item under which this one goes + \param parentItem a parent 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 @@ -224,7 +224,7 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view, Constructs an empty Gantt item. \param type the type of the item to insert - \param parentItem a tqparent item under which this one goes + \param parentItem a parent 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 @@ -268,8 +268,8 @@ KDGanttViewItem::~KDGanttViewItem() if ( listView() ) { if ( isOpen() ) setOpen( false ); - if ( tqparent() ) - tqparent()->takeItem( this ); + if ( parent() ) + parent()->takeItem( this ); else myGanttView->myListView->takeItem( this ); myGanttView->myTimeTable->updateMyContent(); @@ -463,9 +463,9 @@ void KDGanttViewItem::setDisplaySubitemsAsGroup( bool show ) if ( !show && _displaySubitemsAsGroup) isVisibleInGanttView = true; _displaySubitemsAsGroup = show; - if ( tqparent() ) - if ( tqparent()->isOpen() ) - tqparent()->setOpen( true ); + if ( parent() ) + if ( parent()->isOpen() ) + parent()->setOpen( true ); if ( isOpen() ) setOpen( true ); updateCanvasItems(); @@ -1248,14 +1248,14 @@ KDGanttViewItem* KDGanttViewItem::nextSibling() const /*! - Returns the tqparent item of this item + Returns the parent item of this item - \return the tqparent item of this item, 0 if this item is a top-level + \return the parent item of this item, 0 if this item is a top-level item */ -KDGanttViewItem* KDGanttViewItem::tqparent() const +KDGanttViewItem* KDGanttViewItem::parent() const { - return (KDGanttViewItem*)TQListViewItem::tqparent(); + return (KDGanttViewItem*)TQListViewItem::parent(); } @@ -1674,22 +1674,22 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttView* view, Creates a KDGanttViewItem according to the specification in a DOM element. - \param tqparent the tqparent item under which the item will be inserted + \param parent the parent item under which the item will be inserted \param element the DOM element from which to read the specification \return the newly created element */ -KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparent, +KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent, TQDomElement& element ) { TQString typeString = element.attribute( "Type" ); Q_ASSERT( !typeString.isEmpty() ); KDGanttViewItem* item; if( typeString == "Task" ) - item = new KDGanttViewTaskItem( tqparent ); + item = new KDGanttViewTaskItem( parent ); else if( typeString == "Summary" ) - item = new KDGanttViewSummaryItem( tqparent ); + item = new KDGanttViewSummaryItem( parent ); else if( typeString == "Event" ) - item = new KDGanttViewEventItem( tqparent ); + item = new KDGanttViewEventItem( parent ); else { qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" ); return 0; @@ -1704,12 +1704,12 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparen Creates a KDGanttViewItem according to the specification in a DOM element. - \param tqparent the tqparent item under which the item will be inserted + \param parent the parent item under which the item will be inserted \param previous to item behind this one should appear \param element the DOM element from which to read the specification \return the newly created element */ -KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparent, +KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* parent, KDGanttViewItem* previous, TQDomElement& element ) { @@ -1717,11 +1717,11 @@ KDGanttViewItem* KDGanttViewItem::createFromDomElement( KDGanttViewItem* tqparen Q_ASSERT( !typeString.isEmpty() ); KDGanttViewItem* item; if( typeString == "Task" ) - item = new KDGanttViewTaskItem( tqparent, previous ); + item = new KDGanttViewTaskItem( parent, previous ); else if( typeString == "Summary" ) - item = new KDGanttViewSummaryItem( tqparent, previous ); + item = new KDGanttViewSummaryItem( parent, previous ); else if( typeString == "Event" ) - item = new KDGanttViewEventItem( tqparent, previous ); + item = new KDGanttViewEventItem( parent, previous ); else { qDebug( "Unknown item type in KDGanttViewItem::createFromDomElement()" ); return 0; @@ -2228,7 +2228,7 @@ void KDGanttViewItem::paintBranches ( TQPainter* p, const TQColorGroup& cg, int x_c = w/2; int y_c = y+y_coord+ temp->height ()/2; int y_ce ; - if ( temp->itemBelow() && temp->itemBelow()->tqparent() == this ) + if ( temp->itemBelow() && temp->itemBelow()->parent() == this ) y_ce =y+y_coord+ temp->height (); else y_ce = y_c; @@ -2255,11 +2255,11 @@ void KDGanttViewItem::resetSubitemVisibility() if ( myGanttView->calendarMode() ) { // in calendarmode only items can be opened which have subitems which have subitems if ( ! temp ) { - if ( !tqparent() ) - // has no tqparent, has no child : show! + if ( !parent() ) + // has no parent, has no child : show! setVisible( true ); else - // has tqparent, has no child : hide! + // has parent, has no child : hide! setVisible( false ); return; } diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h index e08630b87..9e54755b8 100644 --- a/kdgantt/KDGanttViewItem.h +++ b/kdgantt/KDGanttViewItem.h @@ -65,13 +65,13 @@ protected: KDGanttViewItem( Type type, KDGanttView* view, const TQString& lvtext = TQString(), const TQString& name = TQString() ); - KDGanttViewItem( Type type, KDGanttViewItem* tqparent, + KDGanttViewItem( Type type, KDGanttViewItem* parent, const TQString& lvtext = TQString(), const TQString& name = TQString() ); KDGanttViewItem( Type type, KDGanttView* view, KDGanttViewItem* after, const TQString& lvtext = TQString(), const TQString& name = TQString() ); - KDGanttViewItem( Type type, KDGanttViewItem* tqparent, + KDGanttViewItem( Type type, KDGanttViewItem* parent, KDGanttViewItem* after, const TQString& lvtext = TQString(), const TQString& name = TQString() ); @@ -166,7 +166,7 @@ public: KDGanttViewItem* firstChild() const; KDGanttViewItem* nextSibling() const; - KDGanttViewItem* tqparent() const; + KDGanttViewItem* parent() const; KDGanttViewItem* itemAbove(); KDGanttViewItem* itemBelow( bool includeDisabled = true ); KDGanttViewItem* getChildByName( const TQString& name ); @@ -180,9 +180,9 @@ public: static KDGanttViewItem* createFromDomElement( KDGanttView* view, KDGanttViewItem* previous, TQDomElement& element ); - static KDGanttViewItem* createFromDomElement( KDGanttViewItem* tqparent, + static KDGanttViewItem* createFromDomElement( KDGanttViewItem* parent, TQDomElement& element ); - static KDGanttViewItem* createFromDomElement( KDGanttViewItem* tqparent, + static KDGanttViewItem* createFromDomElement( KDGanttViewItem* parent, KDGanttViewItem* previous, TQDomElement& element ); diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 2b63d1b1e..c6a326a3c 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -58,8 +58,8 @@ #include <kcalendarsystem.h> #include <kdebug.h> -KDTimeTableWidget:: KDTimeTableWidget( TQWidget* tqparent,KDGanttView* myGantt) - : TQCanvas (TQT_TQOBJECT(tqparent)) +KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt) + : TQCanvas (TQT_TQOBJECT(parent)) { myGanttView = myGantt; taskLinksVisible = true; @@ -695,8 +695,8 @@ int KDTimeTableWidget::getCoordX( TQDateTime dt ) { /* *************************************************************** KDTimeHeaderWidget:: KDTimeHeaderWidget ***************************************************************** */ -KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* tqparent,KDGanttView* gant ) - : TQWidget (tqparent) +KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant ) + : TQWidget (parent) { myToolTip = new KDTimeHeaderToolTip(this,this); mySizeHint = 0; @@ -2537,10 +2537,10 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e ) /* *************************************************************** KDLegendWidget:: KDLegendWidget ***************************************************************** */ -KDLegendWidget:: KDLegendWidget( TQWidget* tqparent, +KDLegendWidget:: KDLegendWidget( TQWidget* parent, KDGanttMinimizeSplitter* legendParent ) : KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before, Qt::Vertical, - tqparent) + parent) { myLegendParent = legendParent; dock = 0; @@ -2688,7 +2688,7 @@ bool KDLegendWidget::isShown ( ) } -KDListView::KDListView(TQWidget* tqparent, KDGanttView* gantView):TQListView (tqparent) +KDListView::KDListView(TQWidget* parent, KDGanttView* gantView):TQListView (parent) { myGanttView = gantView; setAcceptDrops(true); @@ -2991,13 +2991,13 @@ void KDListView::dragMoveEvent ( TQDragMoveEvent * e) } if ( e->source() == myGanttView && gItem ){ // internal drag - do not allow to drag the item to a subitem of itself - KDGanttViewItem* pItem = gItem->tqparent(); + KDGanttViewItem* pItem = gItem->parent(); while ( pItem ) { if ( pItem == myGanttView->myCanvasView->lastClickedItem ) { e->accept( false ); return; } - pItem = pItem->tqparent(); + pItem = pItem->parent(); } if ( gItem == myGanttView->myCanvasView->lastClickedItem ) { e->accept( false ); @@ -3152,8 +3152,8 @@ KDCanvasRectangle::KDCanvasRectangle( KDTimeTableWidget* canvas, -KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWidget* tqparent, const - char* name ) : TQCanvasView ( canvas, tqparent, name ), +KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWidget* parent, const + char* name ) : TQCanvasView ( canvas, parent, name ), movingGVItem( 0 ), scrollBarTimer( 0, "scrollBarTimer" ) { @@ -3311,20 +3311,20 @@ void KDGanttCanvasView::insertItemAsRoot( KDGanttViewItem* item ) if ( item == cuttedItem ) cuttedItem = 0; } -void KDGanttCanvasView::insertItemAsChild( KDGanttViewItem* tqparent, KDGanttViewItem* item ) +void KDGanttCanvasView::insertItemAsChild( KDGanttViewItem* parent, KDGanttViewItem* item ) { - tqparent->insertItem( cuttedItem ); + parent->insertItem( cuttedItem ); if ( item == cuttedItem ) cuttedItem = 0; } -void KDGanttCanvasView::insertItemAfter( KDGanttViewItem* tqparent , KDGanttViewItem* item ) +void KDGanttCanvasView::insertItemAfter( KDGanttViewItem* parent , KDGanttViewItem* item ) { - if ( tqparent->tqparent() ) { - tqparent->tqparent()->insertItem( item ); + if ( parent->parent() ) { + parent->parent()->insertItem( item ); } else mySignalSender->myListView->insertItem( item ); - item->moveItem( tqparent ); + item->moveItem( parent ); if ( item == cuttedItem ) cuttedItem = 0; } @@ -3332,9 +3332,9 @@ void KDGanttCanvasView::insertItemAfter( KDGanttViewItem* tqparent , KDGanttVie void KDGanttCanvasView::cutItem() { lastClickedItem->hideSubtree(); - //qDebug("last clicked %d tqparent %d ", lastClickedItem , lastClickedItem->tqparent()); - if ( lastClickedItem->tqparent() ) - lastClickedItem->tqparent()->takeItem(lastClickedItem); + //qDebug("last clicked %d parent %d ", lastClickedItem , lastClickedItem->parent()); + if ( lastClickedItem->parent() ) + lastClickedItem->parent()->takeItem(lastClickedItem); else mySignalSender->myListView->takeItem( lastClickedItem ); mySignalSender->myTimeTable->updateMyContent(); @@ -3370,8 +3370,8 @@ void KDGanttCanvasView::pasteItem( int type ) lastClickedItem->insertItem( cuttedItem ); break; case 2://after - if ( lastClickedItem->tqparent() ) { - lastClickedItem->tqparent()->insertItem( cuttedItem ); + if ( lastClickedItem->parent() ) { + lastClickedItem->parent()->insertItem( cuttedItem ); } else mySignalSender->myListView->insertItem( cuttedItem ); @@ -3418,20 +3418,20 @@ void KDGanttCanvasView::newChildItem( int type ) temp = new KDGanttViewTaskItem( lastClickedItem, i18n( "New Task" ) ); break; case 5: - if ( lastClickedItem->tqparent() ) - temp = new KDGanttViewEventItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Event" ) ); + if ( lastClickedItem->parent() ) + temp = new KDGanttViewEventItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Event" ) ); else temp = new KDGanttViewEventItem( mySignalSender, lastClickedItem, i18n( "New Event" ) ); break; case 4: - if ( lastClickedItem->tqparent() ) - temp = new KDGanttViewSummaryItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Summary" ) ); + if ( lastClickedItem->parent() ) + temp = new KDGanttViewSummaryItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Summary" ) ); else temp = new KDGanttViewSummaryItem( mySignalSender, lastClickedItem, i18n( "New Summary" ) ); break; case 6: - if ( lastClickedItem->tqparent() ) - temp = new KDGanttViewTaskItem( lastClickedItem->tqparent(), lastClickedItem, i18n( "New Task" ) ); + if ( lastClickedItem->parent() ) + temp = new KDGanttViewTaskItem( lastClickedItem->parent(), lastClickedItem, i18n( "New Task" ) ); else temp = new KDGanttViewTaskItem( mySignalSender, lastClickedItem, i18n( "New Task" ) ); break; @@ -3984,7 +3984,7 @@ int KDGanttCanvasView::getLinkType(int from, int to) { /*! Represents the background color for a given interval of time (across all tasks). \sa KDGanttView::addIntervalBackgroundColor - \param view tqparent view + \param view parent view */ KDIntervalColorRectangle::KDIntervalColorRectangle( KDGanttView* view ) : KDCanvasRectangle( view->timeTableWidget(), 0, Type_is_KDGanttGridItem ), diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h index 37e70a563..b044c10ec 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -99,7 +99,7 @@ public: enum HourFormat { Hour_24, Hour_12 }; */ - KDTimeHeaderWidget (TQWidget* tqparent,KDGanttView* gant); + KDTimeHeaderWidget (TQWidget* parent,KDGanttView* gant); ~KDTimeHeaderWidget(); TQString getToolTipText(TQPoint p); @@ -257,7 +257,7 @@ class KDTimeTableWidget : public TQCanvas TQ_OBJECT public: - KDTimeTableWidget (TQWidget* tqparent,KDGanttView* my); + KDTimeTableWidget (TQWidget* parent,KDGanttView* my); void setBlockUpdating( bool block = true ); bool blockUpdating(); @@ -334,7 +334,7 @@ class KDLegendWidget : public KDGanttSemiSizingControl TQ_OBJECT public: - KDLegendWidget ( TQWidget* tqparent, KDGanttMinimizeSplitter* legendParent ); + KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent ); void showMe(bool); bool isShown(); void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text ); @@ -361,7 +361,7 @@ class KDListView : public TQListView TQ_OBJECT public: - KDListView (TQWidget* tqparent,KDGanttView* gv ); + KDListView (TQWidget* parent,KDGanttView* gv ); KDGanttView* myGanttView; void drawToPainter( TQPainter *p, bool drawHeader=false ); void setCalendarMode( bool mode ); @@ -490,7 +490,7 @@ class KDGanttCanvasView : public TQCanvasView TQ_OBJECT public: - KDGanttCanvasView(KDGanttView* sender, TQCanvas* canvas = 0, TQWidget* tqparent = 0, const char* name = 0 ); + KDGanttCanvasView(KDGanttView* sender, TQCanvas* canvas = 0, TQWidget* parent = 0, const char* name = 0 ); ~KDGanttCanvasView(); TQString getToolTipText(TQPoint p); TQString getWhatsThisText(TQPoint p); diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp index 31d21cf9d..96980d2ac 100644 --- a/kdgantt/KDGanttViewSummaryItem.cpp +++ b/kdgantt/KDGanttViewSummaryItem.cpp @@ -65,15 +65,15 @@ KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttView* view, /*! Constructs an empty Gantt item of type event. - \param tqparent a tqparent item under which this one goes + \param parent a parent 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 */ -KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* tqparent, +KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* parent, const TQString& lvtext, const TQString& name ) : - KDGanttViewItem( Summary, tqparent, lvtext, name ) + KDGanttViewItem( Summary, parent, lvtext, name ) { initItem(); } @@ -101,17 +101,17 @@ KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttView* view, /*! Constructs an empty Gantt item of type event. - \param tqparent a tqparent item under which this one goes + \param parent a parent 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 */ -KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* tqparent, +KDGanttViewSummaryItem::KDGanttViewSummaryItem( KDGanttViewItem* parent, KDGanttViewItem* after, const TQString& lvtext, const TQString& name ) : - KDGanttViewItem( Summary, tqparent, after, lvtext, name ) + KDGanttViewItem( Summary, parent, after, lvtext, name ) { initItem(); @@ -272,7 +272,7 @@ void KDGanttViewSummaryItem::showItem( bool show, int coordY ) hideMe(); return; } - if ( displaySubitemsAsGroup() && !tqparent() && !isOpen() ) { + if ( displaySubitemsAsGroup() && !parent() && !isOpen() ) { hideMe(); return; } diff --git a/kdgantt/KDGanttViewSummaryItem.h b/kdgantt/KDGanttViewSummaryItem.h index 3b2bb9c8e..7361adca4 100644 --- a/kdgantt/KDGanttViewSummaryItem.h +++ b/kdgantt/KDGanttViewSummaryItem.h @@ -43,13 +43,13 @@ public: KDGanttViewSummaryItem( KDGanttView* view, const TQString& lvtext = TQString(), const TQString& name = TQString() ); - KDGanttViewSummaryItem( KDGanttViewItem* tqparent, + KDGanttViewSummaryItem( KDGanttViewItem* parent, const TQString& lvtext = TQString(), const TQString& name = TQString() ); KDGanttViewSummaryItem( KDGanttView* view, KDGanttViewItem* after, const TQString& lvtext = TQString(), const TQString& name = TQString() ); - KDGanttViewSummaryItem( KDGanttViewItem* tqparent, KDGanttViewItem* after, + KDGanttViewSummaryItem( KDGanttViewItem* parent, KDGanttViewItem* after, const TQString& lvtext = TQString(), const TQString& name = TQString() ); virtual ~KDGanttViewSummaryItem(); diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp index 8154216bf..a89f23603 100644 --- a/kdgantt/KDGanttViewTaskItem.cpp +++ b/kdgantt/KDGanttViewTaskItem.cpp @@ -79,15 +79,15 @@ KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttView* view, /*! Constructs an empty Gantt item of type event. - \param tqparent a tqparent item under which this one goes + \param parent a parent 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 */ -KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* tqparent, +KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* parent, const TQString& lvtext, const TQString& name ) : - KDGanttViewItem( Task, tqparent, lvtext, name ) + KDGanttViewItem( Task, parent, lvtext, name ) { initItem(); } @@ -115,17 +115,17 @@ KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttView* view, /*! Constructs an empty Gantt item of type event. - \param tqparent a tqparent item under which this one goes + \param parent a parent 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 listview \param name the name by which the item can be identified. If no name is specified, a unique name will be generated */ -KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* tqparent, +KDGanttViewTaskItem::KDGanttViewTaskItem( KDGanttViewItem* parent, KDGanttViewItem* after, const TQString& lvtext, const TQString& name ) : - KDGanttViewItem( Task, tqparent, after, lvtext, name ) + KDGanttViewItem( Task, parent, after, lvtext, name ) { initItem(); } @@ -216,7 +216,7 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY) floatEndShape->setZ(startShape->z()+0.003); // less than textCanvas floatEndShape->hide(); textCanvas->setZ( prio + 0.005 ); - if ( displaySubitemsAsGroup() && !tqparent() && !isOpen() ) { + if ( displaySubitemsAsGroup() && !parent() && !isOpen() ) { hideMe(); return; } @@ -242,9 +242,9 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY) } int hei = height(); if ( ! isVisible() ) { - KDGanttViewItem * par = tqparent(); + KDGanttViewItem * par = parent(); while ( par != 0 && !par->isVisible() ) - par = par->tqparent(); + par = par->parent(); if ( par ) hei = par->height(); } @@ -356,9 +356,9 @@ void KDGanttViewTaskItem::initItem() { isVisibleInGanttView = false; - if ( myGanttView->calendarMode() && tqparent() ) { + if ( myGanttView->calendarMode() && parent() ) { setVisible( false ); - tqparent()->setVisible( true ); + parent()->setVisible( true ); } else showItem(true); //qDebug("initItem %s %s", listViewText().latin1(),startShape->brush().color().name().latin1() ); diff --git a/kdgantt/KDGanttViewTaskItem.h b/kdgantt/KDGanttViewTaskItem.h index cd77240e4..aa958d2ce 100644 --- a/kdgantt/KDGanttViewTaskItem.h +++ b/kdgantt/KDGanttViewTaskItem.h @@ -46,13 +46,13 @@ public: KDGanttViewTaskItem( KDGanttView* view, const TQString& lvtext = TQString(), const TQString& name = TQString() ); - KDGanttViewTaskItem( KDGanttViewItem* tqparent, + KDGanttViewTaskItem( KDGanttViewItem* parent, const TQString& lvtext = TQString(), const TQString& name = TQString() ); KDGanttViewTaskItem( KDGanttView* view, KDGanttViewItem* after, const TQString& lvtext = TQString(), const TQString& name = TQString() ); - KDGanttViewTaskItem( KDGanttViewItem* tqparent, KDGanttViewItem* after, + KDGanttViewTaskItem( KDGanttViewItem* parent, KDGanttViewItem* after, const TQString& lvtext = TQString(), const TQString& name = TQString() ); virtual ~KDGanttViewTaskItem(); diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp index e6246138c..5f2909c07 100644 --- a/kdgantt/KDGanttXMLTools.cpp +++ b/kdgantt/KDGanttXMLTools.cpp @@ -40,12 +40,12 @@ namespace KDGanttXML { -void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent, +void createBoolNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, bool value ) { TQDomElement newElement = doc.createElement( elementName ); - tqparent.appendChild( newElement ); + parent.appendChild( newElement ); TQDomText elementContent = doc.createTextNode( value ? "true" : "false" ); newElement.appendChild( elementContent ); @@ -53,59 +53,59 @@ void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent, -void createSizeNode( TQDomDocument& doc, TQDomNode& tqparent, +void createSizeNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQSize& value ) { TQDomElement newElement = doc.createElement( elementName ); - tqparent.appendChild( newElement ); + parent.appendChild( newElement ); newElement.setAttribute( "Width", value.width() ); newElement.setAttribute( "Height", value.height() ); } -void createIntNode( TQDomDocument& doc, TQDomNode& tqparent, +void createIntNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, int value ) { TQDomElement newElement = doc.createElement( elementName ); - tqparent.appendChild( newElement ); + parent.appendChild( newElement ); TQDomText elementContent = doc.createTextNode( TQString::number( value ) ); newElement.appendChild( elementContent ); } -void createDoubleNode( TQDomDocument& doc, TQDomNode& tqparent, +void createDoubleNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, double value ) { TQDomElement newElement = doc.createElement( elementName ); - tqparent.appendChild( newElement ); + parent.appendChild( newElement ); TQDomText elementContent = doc.createTextNode( TQString::number( value ) ); newElement.appendChild( elementContent ); } -void createStringNode( TQDomDocument& doc, TQDomNode& tqparent, +void createStringNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQString& text ) { TQDomElement newElement = doc.createElement( elementName ); - tqparent.appendChild( newElement ); + parent.appendChild( newElement ); TQDomText elementContent = doc.createTextNode( text ); newElement.appendChild( elementContent ); } -void createColorNode( TQDomDocument& doc, TQDomNode& tqparent, +void createColorNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQColor& color ) { TQDomElement colorElement = doc.createElement( elementName ); - tqparent.appendChild( colorElement ); + parent.appendChild( colorElement ); colorElement.setAttribute( "Red", TQString::number( color.red() ) ); colorElement.setAttribute( "Green", @@ -115,12 +115,12 @@ void createColorNode( TQDomDocument& doc, TQDomNode& tqparent, } -void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent, +void createBrushNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQBrush& brush ) { TQDomElement brushElement = doc.createElement( elementName ); - tqparent.appendChild( brushElement ); + parent.appendChild( brushElement ); createColorNode( doc, brushElement, "Color", brush.color() ); createStringNode( doc, brushElement, "Style", KDGanttXML::brushStyleToString( brush.style() ) ); @@ -129,11 +129,11 @@ void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent, } -void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent, +void createPixmapNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQPixmap& pixmap ) { TQDomElement pixmapElement = doc.createElement( elementName ); - tqparent.appendChild( pixmapElement ); + parent.appendChild( pixmapElement ); // Convert the pixmap to an image, save that image to an in-memory // XPM representation and compress this representation. This @@ -163,11 +163,11 @@ void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent, } -void createRectNode( TQDomDocument& doc, TQDomNode& tqparent, +void createRectNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQRect& rect ) { TQDomElement rectElement = doc.createElement( elementName ); - tqparent.appendChild( rectElement ); + parent.appendChild( rectElement ); TQDomElement xElement = doc.createElement( "X" ); rectElement.appendChild( xElement ); TQDomText xContent = doc.createTextNode( TQString::number( rect.x() ) ); @@ -187,7 +187,7 @@ void createRectNode( TQDomDocument& doc, TQDomNode& tqparent, } -void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent, +void createStringListNodes( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQStringList* list ) { @@ -197,18 +197,18 @@ void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent, for( TQStringList::ConstIterator it = list->begin(); it != list->end(); ++it ) { TQDomElement element = doc.createElement( elementName ); - tqparent.appendChild( element ); + parent.appendChild( element ); TQDomText elementContent = doc.createTextNode( *it ); element.appendChild( elementContent ); } } -void createFontNode( TQDomDocument& doc, TQDomNode& tqparent, +void createFontNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQFont& font ) { TQDomElement fontElement = doc.createElement( elementName ); - tqparent.appendChild( fontElement ); + parent.appendChild( fontElement ); createStringNode( doc, fontElement, "Family", font.family() ); createIntNode( doc, fontElement, "PointSize", font.pointSize() ); createIntNode( doc, fontElement, "PixelSize", font.pixelSize() ); @@ -217,44 +217,44 @@ void createFontNode( TQDomDocument& doc, TQDomNode& tqparent, } -void createPenNode( TQDomDocument& doc, TQDomNode& tqparent, +void createPenNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQPen& pen ) { TQDomElement penElement = doc.createElement( elementName ); - tqparent.appendChild( penElement ); + parent.appendChild( penElement ); createIntNode( doc, penElement, "Width", pen.width() ); createColorNode( doc, penElement, "Color", pen.color() ); createStringNode( doc, penElement, "Style", penStyleToString( pen.style() ) ); } -void createDateTimeNode( TQDomDocument& doc, TQDomNode& tqparent, +void createDateTimeNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQDateTime& datetime ) { TQDomElement dateTimeElement = doc.createElement( elementName ); - tqparent.appendChild( dateTimeElement ); + parent.appendChild( dateTimeElement ); createDateNode( doc, dateTimeElement, "Date", datetime.date() ); createTimeNode( doc, dateTimeElement, "Time", datetime.time() ); } -void createDateNode( TQDomDocument& doc, TQDomNode& tqparent, +void createDateNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQDate& date ) { TQDomElement dateElement = doc.createElement( elementName ); - tqparent.appendChild( dateElement ); + parent.appendChild( dateElement ); dateElement.setAttribute( "Year", TQString::number( date.year() ) ); dateElement.setAttribute( "Month", TQString::number( date.month() ) ); dateElement.setAttribute( "Day", TQString::number( date.day() ) ); } -void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent, +void createTimeNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQTime& time ) { TQDomElement timeElement = doc.createElement( elementName ); - tqparent.appendChild( timeElement ); + parent.appendChild( timeElement ); timeElement.setAttribute( "Hour", TQString::number( time.hour() ) ); timeElement.setAttribute( "Minute", diff --git a/kdgantt/KDGanttXMLTools.h b/kdgantt/KDGanttXMLTools.h index 8ea81f464..2583ec81b 100644 --- a/kdgantt/KDGanttXMLTools.h +++ b/kdgantt/KDGanttXMLTools.h @@ -50,39 +50,39 @@ namespace KDGanttXML { TQString brushStyleToString( Qt::BrushStyle style ); Qt::BrushStyle stringToBrushStyle( const TQString& style ); - void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent, + void createBoolNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, bool value ); - void createSizeNode( TQDomDocument& doc, TQDomNode& tqparent, + void createSizeNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQSize& value ); - void createIntNode( TQDomDocument& doc, TQDomNode& tqparent, + void createIntNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, int value ); - void createDoubleNode( TQDomDocument& doc, TQDomNode& tqparent, + void createDoubleNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, double value ); - void createStringNode( TQDomDocument& doc, TQDomNode& tqparent, + void createStringNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQString& text ); - void createColorNode( TQDomDocument& doc, TQDomNode& tqparent, + void createColorNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQColor& color ); - void createBrushNode( TQDomDocument& doc, TQDomNode& tqparent, + void createBrushNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQBrush& brush ); - void createPixmapNode( TQDomDocument& doc, TQDomNode& tqparent, + void createPixmapNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQPixmap& pixmap ); - void createRectNode( TQDomDocument& doc, TQDomNode& tqparent, + void createRectNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQRect& rect ); - void createStringListNodes( TQDomDocument& doc, TQDomNode& tqparent, + void createStringListNodes( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQStringList* list ); - void createFontNode( TQDomDocument& doc, TQDomNode& tqparent, + void createFontNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQFont& font ); - void createPenNode( TQDomDocument& doc, TQDomNode& tqparent, + void createPenNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQPen& pen ); - void createDateTimeNode( TQDomDocument& doc, TQDomNode& tqparent, + void createDateTimeNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQDateTime& datetime ); - void createDateNode( TQDomDocument& doc, TQDomNode& tqparent, + void createDateNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQDate& date ); - void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent, + void createTimeNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQTime& time ); bool readIntNode( const TQDomElement& element, int& value ); bool readStringNode( const TQDomElement& element, TQString& value ); diff --git a/kfile-plugins/ics/kfile_ics.cpp b/kfile-plugins/ics/kfile_ics.cpp index aa4ece8c9..b8346f4f4 100644 --- a/kfile-plugins/ics/kfile_ics.cpp +++ b/kfile-plugins/ics/kfile_ics.cpp @@ -33,8 +33,8 @@ using namespace KCal; typedef KGenericFactory<ICSPlugin> ICSFactory; K_EXPORT_COMPONENT_FACTORY(kfile_ics, ICSFactory( "kfile_ics" )) -ICSPlugin::ICSPlugin( TQObject *tqparent, const char *name, const TQStringList& args ) - : KFilePlugin( tqparent, name, args ) +ICSPlugin::ICSPlugin( TQObject *parent, const char *name, const TQStringList& args ) + : KFilePlugin( parent, name, args ) { KFileMimeTypeInfo* info = addMimeTypeInfo( "text/calendar" ); //TODO: vcs !! diff --git a/kfile-plugins/ics/kfile_ics.h b/kfile-plugins/ics/kfile_ics.h index 342c0d454..ad8078602 100644 --- a/kfile-plugins/ics/kfile_ics.h +++ b/kfile-plugins/ics/kfile_ics.h @@ -29,7 +29,7 @@ class ICSPlugin : public KFilePlugin Q_OBJECT TQ_OBJECT public: - ICSPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + ICSPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what ); }; diff --git a/kfile-plugins/palm-databases/kfile_palm.cpp b/kfile-plugins/palm-databases/kfile_palm.cpp index 0e4db00cd..c38650766 100644 --- a/kfile-plugins/palm-databases/kfile_palm.cpp +++ b/kfile-plugins/palm-databases/kfile_palm.cpp @@ -33,10 +33,10 @@ typedef KGenericFactory<KPalmPlugin> PalmFactory; K_EXPORT_COMPONENT_FACTORY(kfile_palm, PalmFactory( "kfile_palm" )) -KPalmPlugin::KPalmPlugin(TQObject *tqparent, const char *name, +KPalmPlugin::KPalmPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/vnd.palm" ); diff --git a/kfile-plugins/palm-databases/kfile_palm.h b/kfile-plugins/palm-databases/kfile_palm.h index d42225ee1..edd9441b1 100644 --- a/kfile-plugins/palm-databases/kfile_palm.h +++ b/kfile-plugins/palm-databases/kfile_palm.h @@ -32,7 +32,7 @@ class KPalmPlugin: public KFilePlugin TQ_OBJECT public: - KPalmPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KPalmPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); // virtual bool writeInfo( const KFileMetaInfo& info ) const; diff --git a/kfile-plugins/rfc822/kfile_rfc822.cpp b/kfile-plugins/rfc822/kfile_rfc822.cpp index f5ee73c62..6d2488841 100644 --- a/kfile-plugins/rfc822/kfile_rfc822.cpp +++ b/kfile-plugins/rfc822/kfile_rfc822.cpp @@ -42,10 +42,10 @@ typedef KGenericFactory<KRfc822Plugin> Rfc822Factory; K_EXPORT_COMPONENT_FACTORY(kfile_rfc822, Rfc822Factory( "kfile_rfc822" )) -KRfc822Plugin::KRfc822Plugin(TQObject *tqparent, const char *name, +KRfc822Plugin::KRfc822Plugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "message/rfc822" ); diff --git a/kfile-plugins/rfc822/kfile_rfc822.h b/kfile-plugins/rfc822/kfile_rfc822.h index 9a2325066..fee88d635 100644 --- a/kfile-plugins/rfc822/kfile_rfc822.h +++ b/kfile-plugins/rfc822/kfile_rfc822.h @@ -30,7 +30,7 @@ class KRfc822Plugin: public KFilePlugin TQ_OBJECT public: - KRfc822Plugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KRfc822Plugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/vcf/kfile_vcf.cpp b/kfile-plugins/vcf/kfile_vcf.cpp index 7297179d0..c8c853f76 100644 --- a/kfile-plugins/vcf/kfile_vcf.cpp +++ b/kfile-plugins/vcf/kfile_vcf.cpp @@ -33,10 +33,10 @@ typedef KGenericFactory<KVcfPlugin> VcfFactory; K_EXPORT_COMPONENT_FACTORY(kfile_vcf, VcfFactory( "kfile_vcf" )) -KVcfPlugin::KVcfPlugin(TQObject *tqparent, const char *name, +KVcfPlugin::KVcfPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "text/x-vcard" ); diff --git a/kfile-plugins/vcf/kfile_vcf.h b/kfile-plugins/vcf/kfile_vcf.h index e617d4db7..4f039e5da 100644 --- a/kfile-plugins/vcf/kfile_vcf.h +++ b/kfile-plugins/vcf/kfile_vcf.h @@ -30,7 +30,7 @@ class KVcfPlugin: public KFilePlugin TQ_OBJECT public: - KVcfPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KVcfPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kgantt/kgantt/KGantt.cpp b/kgantt/kgantt/KGantt.cpp index a3360c7a5..249f11ad9 100644 --- a/kgantt/kgantt/KGantt.cpp +++ b/kgantt/kgantt/KGantt.cpp @@ -15,8 +15,8 @@ KGantt::KGantt(KGanttItem* toplevelitem, - TQWidget* tqparent, const char * name, WFlags f) - : TQWidget(tqparent,name,f) + TQWidget* parent, const char * name, WFlags f) + : TQWidget(parent,name,f) { #ifdef _DEBUG_ printf("KGantt::KGantt()\n"); diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h index 7448e01a3..5fc77fe4d 100644 --- a/kgantt/kgantt/KGantt.h +++ b/kgantt/kgantt/KGantt.h @@ -103,7 +103,7 @@ public: * */ KGantt(KGanttItem* toplevelitem = 0, - TQWidget* tqparent = 0, const char * name=0, WFlags f=0 ); + TQWidget* parent = 0, const char * name=0, WFlags f=0 ); /// Destructor. diff --git a/kgantt/kgantt/KGanttBarConfig.cpp b/kgantt/kgantt/KGanttBarConfig.cpp index e41dc7c60..ff5f4ee8e 100644 --- a/kgantt/kgantt/KGanttBarConfig.cpp +++ b/kgantt/kgantt/KGanttBarConfig.cpp @@ -13,9 +13,9 @@ KGanttBarConfig::KGanttBarConfig(xQGanttBarView* barview, - TQWidget* tqparent, + TQWidget* parent, const char * name, WFlags f) - : TQWidget(tqparent,name,f) + : TQWidget(parent,name,f) { _barview = barview; KColorButton* b = new KColorButton(this); diff --git a/kgantt/kgantt/KGanttBarConfig.h b/kgantt/kgantt/KGanttBarConfig.h index e12475b1d..fae399d05 100644 --- a/kgantt/kgantt/KGanttBarConfig.h +++ b/kgantt/kgantt/KGanttBarConfig.h @@ -43,7 +43,7 @@ class KGanttBarConfig : public TQWidget public: KGanttBarConfig(xQGanttBarView* barview, - TQWidget* tqparent = 0, const char* name=0, WFlags f=0); + TQWidget* parent = 0, const char* name=0, WFlags f=0); protected slots: diff --git a/kgantt/kgantt/xQGanttBarView.cpp b/kgantt/kgantt/xQGanttBarView.cpp index f85fea6b4..60d25797d 100644 --- a/kgantt/kgantt/xQGanttBarView.cpp +++ b/kgantt/kgantt/xQGanttBarView.cpp @@ -12,9 +12,9 @@ xQGanttBarView::xQGanttBarView(KGanttItem* toplevelitem, - TQWidget* tqparent, + TQWidget* parent, const char * name, WFlags f) - : TQScrollView(tqparent,name,f) + : TQScrollView(parent,name,f) { _config = NULL; diff --git a/kgantt/kgantt/xQGanttBarView.h b/kgantt/kgantt/xQGanttBarView.h index d9037b404..b22753c53 100644 --- a/kgantt/kgantt/xQGanttBarView.h +++ b/kgantt/kgantt/xQGanttBarView.h @@ -62,7 +62,7 @@ public: /*! * */ - xQGanttBarView(KGanttItem* toplevelitem, TQWidget* tqparent = 0, + xQGanttBarView(KGanttItem* toplevelitem, TQWidget* parent = 0, const char * name=0, WFlags f=0 ); diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp index 6ac4daaee..536761eaa 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort.cpp @@ -22,12 +22,12 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem, - xQGanttBarView* tqparent, + xQGanttBarView* parent, const char * name, WFlags f) - : TQFrame(tqparent,name,f) + : TQFrame(parent,name,f) ///////////////////////////////////////////////////////////////////////////// { - _tqparent = tqparent; + _parent = parent; closedIcon = TQPixmap(open_xpm); openedIcon = TQPixmap(close_xpm); @@ -239,7 +239,7 @@ xQGanttBarViewPort::initMenu() pix = _iconloader->loadIcon("configure.png", KIcon::Toolbar , 16 ); if(pix.isNull()) printf("configure.png not found !\n"); - _menu->insertItem(pix, i18n("Configure Gantt..."), _tqparent, TQT_SLOT(showConfig())); + _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQT_SLOT(showConfig())); } @@ -839,7 +839,7 @@ xQGanttBarViewPort::zoom(double sfactor, int sx, int sy) recalc(); adjustSize(); - _tqparent->center(screenX(wx), screenY(wy) ); + _parent->center(screenX(wx), screenY(wy) ); TQWidget::update(); @@ -854,12 +854,12 @@ xQGanttBarViewPort::zoom(double sfactor) { printf("zoom %f \n", sfactor ); - int x = (int) (_tqparent->visibleWidth()/2 + 0.5); - int y = (int) (_tqparent->visibleHeight()/2 + 0.5); + int x = (int) (_parent->visibleWidth()/2 + 0.5); + int y = (int) (_parent->visibleHeight()/2 + 0.5); printf("dx/2 = %d, dy/2 = %d \n", x,y); - zoom(sfactor, x + _tqparent->contentsX(), y + _tqparent->contentsY() ); + zoom(sfactor, x + _parent->contentsX(), y + _parent->contentsY() ); } @@ -872,7 +872,7 @@ xQGanttBarViewPort::zoomAll() printf("zoom all. scaleX = %f\n", _scaleX ); #endif - _scaleX = ((double) _tqparent->visibleWidth()*60)/ + _scaleX = ((double) _parent->visibleWidth()*60)/ ((double) (_toplevelitem->getStart().secsTo(_toplevelitem->getEnd()) + _marginX*120)); recalc(); diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h index e84761e14..fa6b7483e 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.h +++ b/kgantt/kgantt/xQGanttBarViewPort.h @@ -104,7 +104,7 @@ public: /*! * */ - xQGanttBarViewPort(KGanttItem* toplevelitem, xQGanttBarView* tqparent = 0, + xQGanttBarViewPort(KGanttItem* toplevelitem, xQGanttBarView* parent = 0, const char * name=0, WFlags f=0 ); @@ -245,7 +245,7 @@ private: // this will be set by setParentScrollView() - xQGanttBarView* _tqparent; + xQGanttBarView* _parent; int _grid, _snapgrid; bool _drawGrid, _drawHeader; diff --git a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp index ffd85d305..52f017e27 100644 --- a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp @@ -245,7 +245,7 @@ xQGanttBarViewPort::mouseReleaseEvent(TQMouseEvent* e) double sys_width = fabs(x2 - x1); - double mass = (_tqparent->visibleWidth()/ sys_width); + double mass = (_parent->visibleWidth()/ sys_width); zoom(mass, (int) (x1+(x2-x1)/2), (int) (y1+(y2-y1)/2) ); diff --git a/kgantt/kgantt/xQGanttListView.cpp b/kgantt/kgantt/xQGanttListView.cpp index f5a587dab..3f5f44c28 100644 --- a/kgantt/kgantt/xQGanttListView.cpp +++ b/kgantt/kgantt/xQGanttListView.cpp @@ -10,9 +10,9 @@ #include <tqcolor.h> #include <klocale.h> -xQGanttListView::xQGanttListView(KGanttItem* toplevelitem, TQWidget* tqparent, +xQGanttListView::xQGanttListView(KGanttItem* toplevelitem, TQWidget* parent, const char * name, WFlags f) - : TQScrollView(tqparent,name,f) + : TQScrollView(parent,name,f) ///////////////////////////////////////////////////////// { _toplevelitem = toplevelitem; diff --git a/kgantt/kgantt/xQGanttListView.h b/kgantt/kgantt/xQGanttListView.h index fa0f973da..3842abe88 100644 --- a/kgantt/kgantt/xQGanttListView.h +++ b/kgantt/kgantt/xQGanttListView.h @@ -59,7 +59,7 @@ public: /*! * */ - xQGanttListView(KGanttItem* toplevelitem, TQWidget* tqparent = 0, + xQGanttListView(KGanttItem* toplevelitem, TQWidget* parent = 0, const char * name=0, WFlags f=0 ); diff --git a/kgantt/kgantt/xQGanttListViewPort.cpp b/kgantt/kgantt/xQGanttListViewPort.cpp index 2549c8807..d643fe8cb 100644 --- a/kgantt/kgantt/xQGanttListViewPort.cpp +++ b/kgantt/kgantt/xQGanttListViewPort.cpp @@ -13,9 +13,9 @@ int xQGanttListViewPort::_ListViewCounter = 0; -xQGanttListViewPort::xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* tqparent, +xQGanttListViewPort::xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* parent, const char * name, WFlags f ) - : TQFrame(tqparent,name,f) + : TQFrame(parent,name,f) { _toplevelitem = toplevelitem; diff --git a/kgantt/kgantt/xQGanttListViewPort.h b/kgantt/kgantt/xQGanttListViewPort.h index a2e97ca3b..365b316ba 100644 --- a/kgantt/kgantt/xQGanttListViewPort.h +++ b/kgantt/kgantt/xQGanttListViewPort.h @@ -61,7 +61,7 @@ public: /*! * */ - xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* tqparent = 0, + xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* parent = 0, const char * name=0, WFlags f=0 ); diff --git a/kioslaves/mbox/mboxfile.cc b/kioslaves/mbox/mboxfile.cc index 3c6c6cc7a..271b71019 100644 --- a/kioslaves/mbox/mboxfile.cc +++ b/kioslaves/mbox/mboxfile.cc @@ -20,9 +20,9 @@ #include <assert.h> -MBoxFile::MBoxFile( const UrlInfo* info, MBoxProtocol* tqparent ) +MBoxFile::MBoxFile( const UrlInfo* info, MBoxProtocol* parent ) : m_info( info ), - m_mbox( tqparent ) + m_mbox( parent ) { assert( m_info ); } diff --git a/kioslaves/mbox/mboxfile.h b/kioslaves/mbox/mboxfile.h index a628e3817..b8a98973e 100644 --- a/kioslaves/mbox/mboxfile.h +++ b/kioslaves/mbox/mboxfile.h @@ -32,9 +32,9 @@ public: /** * Constructor * @param info The urlinfo which must be used - * @param tqparent The MBoxProtocol tqparent instance, used to throw errors. + * @param parent The MBoxProtocol parent instance, used to throw errors. */ - MBoxFile( const UrlInfo* info, MBoxProtocol* tqparent ); + MBoxFile( const UrlInfo* info, MBoxProtocol* parent ); /** * Empty destructor @@ -61,7 +61,7 @@ protected: const UrlInfo* const m_info; /** - * A instance of the tqparent protocol, meant to throw errors if neccesairy. + * A instance of the parent protocol, meant to throw errors if neccesairy. */ MBoxProtocol* const m_mbox; }; diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc index cc8503a5d..6094bfc01 100644 --- a/kioslaves/mbox/readmbox.cc +++ b/kioslaves/mbox/readmbox.cc @@ -37,8 +37,8 @@ #include <utime.h> -ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* tqparent, bool onlynew, bool savetime ) - : MBoxFile( info, tqparent ), +ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew, bool savetime ) + : MBoxFile( info, parent ), m_file( 0 ), m_stream( 0 ), m_current_line( new TQString( TQString() ) ), diff --git a/kioslaves/mbox/readmbox.h b/kioslaves/mbox/readmbox.h index ea63068ca..046767be7 100644 --- a/kioslaves/mbox/readmbox.h +++ b/kioslaves/mbox/readmbox.h @@ -40,11 +40,11 @@ public: * Constructor * * @param info The information of the file to read - * @param tqparent The instance of the tqparent MBoxProtocol. + * @param parent The instance of the parent MBoxProtocol. * @param onlynew Only read new messages from the MBox file. * @param savetime If true, the atime of the mbox-file is preserved (note that this touch the ctime). */ - ReadMBox( const UrlInfo* info, MBoxProtocol* tqparent, bool onlynew = false, bool savetime = false ); + ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew = false, bool savetime = false ); /** * Destructor diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h index 1ab3fb720..4b356dcf5 100644 --- a/kitchensync/libqopensync/syncchange.h +++ b/kitchensync/libqopensync/syncchange.h @@ -92,7 +92,7 @@ class SyncChange TQString objectFormatName() const; /** - Returns the tqparent member of this change. + Returns the parent member of this change. */ Member member() const; diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp index 1590338c2..6055864a2 100644 --- a/kitchensync/src/aboutpage.cpp +++ b/kitchensync/src/aboutpage.cpp @@ -48,8 +48,8 @@ static TQString readFile( const TQString &fileName ) return content; } -AboutPage::AboutPage( TQWidget *tqparent ) - : TQWidget( tqparent, "AboutPage" ) +AboutPage::AboutPage( TQWidget *parent ) + : TQWidget( parent, "AboutPage" ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); diff --git a/kitchensync/src/aboutpage.h b/kitchensync/src/aboutpage.h index 9da3a72b9..ce813c206 100644 --- a/kitchensync/src/aboutpage.h +++ b/kitchensync/src/aboutpage.h @@ -31,7 +31,7 @@ class AboutPage : public TQWidget TQ_OBJECT public: - AboutPage( TQWidget *tqparent ); + AboutPage( TQWidget *parent ); signals: void addGroup(); diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp index 2fb7ef18d..6e2aa5d70 100644 --- a/kitchensync/src/configgui.cpp +++ b/kitchensync/src/configgui.cpp @@ -49,8 +49,8 @@ #include <tqlabel.h> #include <tqtextedit.h> -ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *tqparent ) - : TQWidget( tqparent ), mMember( member ) +ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *parent ) + : TQWidget( parent ), mMember( member ) { mTopLayout = new TQVBoxLayout( this ); mTopLayout->setSpacing( KDialog::spacingHint() ); @@ -76,49 +76,49 @@ TQString ConfigGui::instanceName() const } ConfigGui *ConfigGui::Factory::create( const QSync::Member &member, - TQWidget *tqparent ) + TQWidget *parent ) { TQString name = member.pluginName(); if ( name == "file-sync" ) { - return new ConfigGuiFile( member, tqparent ); + return new ConfigGuiFile( member, parent ); } else if ( name == "palm-sync" ) { - return new ConfigGuiPalm( member, tqparent ); + return new ConfigGuiPalm( member, parent ); } else if ( name == "irmc-sync" ) { - return new ConfigGuiIRMC( member, tqparent ); + return new ConfigGuiIRMC( member, parent ); } else if ( name == "syncml-obex-client" ) { - return new ConfigGuiSyncmlObex( member, tqparent ); + return new ConfigGuiSyncmlObex( member, parent ); } else if ( name == "syncml-http-server" ) { - return new ConfigGuiSyncmlHttp( member, tqparent ); + return new ConfigGuiSyncmlHttp( member, parent ); } else if ( name == "opie-sync" ) { - return new ConfigGuiOpie( member, tqparent ); + return new ConfigGuiOpie( member, parent ); } else if ( name == "gnokii-sync" ) { - return new ConfigGuiGnokii( member, tqparent ); + return new ConfigGuiGnokii( member, parent ); } else if ( name == "gpe-sync" ) { - return new ConfigGuiGpe( member, tqparent ); + return new ConfigGuiGpe( member, parent ); } else if ( name == "google-calendar" ) { - return new ConfigGuiGoogleCalendar( member, tqparent ); + return new ConfigGuiGoogleCalendar( member, parent ); } else if ( name == "ldap-sync" ) { - return new ConfigGuiLdap( member, tqparent ); + return new ConfigGuiLdap( member, parent ); } else if ( name == "kdepim-sync" ) { - return new ConfigGuiBlank( member, tqparent ); + return new ConfigGuiBlank( member, parent ); } else if ( name == "jescs-sync" ) { - return new ConfigGuiJescs( member, tqparent ); + return new ConfigGuiJescs( member, parent ); } else if ( name == "evo2-sync" ) { - return new ConfigGuiEvo2( member, tqparent ); + return new ConfigGuiEvo2( member, parent ); } else if ( name == "moto-sync" ) { - return new ConfigGuiMoto( member, tqparent ); + return new ConfigGuiMoto( member, parent ); } else if ( name == "synce-plugin" ) { - return new ConfigGuiSynce( member, tqparent ); + return new ConfigGuiSynce( member, parent ); } else if ( name == "sunbird-sync" ) { - return new ConfigGuiSunbird( member, tqparent ); + return new ConfigGuiSunbird( member, parent ); } else { - return new ConfigGuiXml( member, tqparent ); + return new ConfigGuiXml( member, parent ); } } -ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { mTextEdit = new TQTextEdit( this ); topLayout()->addWidget( mTextEdit ); diff --git a/kitchensync/src/configgui.h b/kitchensync/src/configgui.h index 9f784dc2b..6b7b1b105 100644 --- a/kitchensync/src/configgui.h +++ b/kitchensync/src/configgui.h @@ -32,12 +32,12 @@ class TQTextEdit; class ConfigGui : public TQWidget { public: - ConfigGui( const QSync::Member &, TQWidget *tqparent ); + ConfigGui( const QSync::Member &, TQWidget *parent ); class Factory { public: - static ConfigGui *create( const QSync::Member &, TQWidget *tqparent ); + static ConfigGui *create( const QSync::Member &, TQWidget *parent ); }; void setInstanceName( const TQString & ); @@ -60,7 +60,7 @@ class ConfigGui : public TQWidget class ConfigGuiXml : public ConfigGui { public: - ConfigGuiXml( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiXml( const QSync::Member &, TQWidget *parent ); void load( const TQString & ); TQString save() const; diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp index e5e60f201..3e9d47b65 100644 --- a/kitchensync/src/configguiblank.cpp +++ b/kitchensync/src/configguiblank.cpp @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <tqlayout.h> -ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { TQLabel *label = new TQLabel( i18n( "This member/plugin needs no configuration." ), this ); topLayout()->addWidget( label ); diff --git a/kitchensync/src/configguiblank.h b/kitchensync/src/configguiblank.h index 738c5adb8..e2048ac79 100644 --- a/kitchensync/src/configguiblank.h +++ b/kitchensync/src/configguiblank.h @@ -26,7 +26,7 @@ class ConfigGuiBlank : public ConfigGui { public: - ConfigGuiBlank( const QSync::Member &member, TQWidget *tqparent = 0 ); + ConfigGuiBlank( const QSync::Member &member, TQWidget *parent = 0 ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp index 3a6db784e..0c79fedf0 100644 --- a/kitchensync/src/configguievo2.cpp +++ b/kitchensync/src/configguievo2.cpp @@ -32,8 +32,8 @@ #include <kdialog.h> #include <klocale.h> -ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { initGUI(); } diff --git a/kitchensync/src/configguievo2.h b/kitchensync/src/configguievo2.h index 5e030aa97..7e3a17679 100644 --- a/kitchensync/src/configguievo2.h +++ b/kitchensync/src/configguievo2.h @@ -29,7 +29,7 @@ class KURLRequester; class ConfigGuiEvo2 : public ConfigGui { public: - ConfigGuiEvo2( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiEvo2( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp index fdf4c8ce8..6a8b0402c 100644 --- a/kitchensync/src/configguifile.cpp +++ b/kitchensync/src/configguifile.cpp @@ -30,8 +30,8 @@ #include <tqlabel.h> #include <tqdom.h> -ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { TQBoxLayout *filenameLayout = new TQHBoxLayout( topLayout() ); diff --git a/kitchensync/src/configguifile.h b/kitchensync/src/configguifile.h index 7859fbeee..db9385223 100644 --- a/kitchensync/src/configguifile.h +++ b/kitchensync/src/configguifile.h @@ -29,7 +29,7 @@ class TQCheckBox; class ConfigGuiFile : public ConfigGui { public: - ConfigGuiFile( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiFile( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp index d832157e7..8e8006764 100644 --- a/kitchensync/src/configguigcalendar.cpp +++ b/kitchensync/src/configguigcalendar.cpp @@ -29,8 +29,8 @@ #include <tqdom.h> #include <tqlineedit.h> -ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { TQBoxLayout *userLayout = new TQHBoxLayout( topLayout() ); diff --git a/kitchensync/src/configguigcalendar.h b/kitchensync/src/configguigcalendar.h index 458e948d8..198cf77ca 100644 --- a/kitchensync/src/configguigcalendar.h +++ b/kitchensync/src/configguigcalendar.h @@ -29,7 +29,7 @@ class TQLineEdit; class ConfigGuiGoogleCalendar : public ConfigGui { public: - ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp index dfc7413e7..84db02752 100644 --- a/kitchensync/src/configguignokii.cpp +++ b/kitchensync/src/configguignokii.cpp @@ -34,8 +34,8 @@ #include <tqdom.h> #include <tqvbox.h> -ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { TQGridLayout *tqlayout = new TQGridLayout( topLayout() ); diff --git a/kitchensync/src/configguignokii.h b/kitchensync/src/configguignokii.h index 673dce0a0..d99e19f8b 100644 --- a/kitchensync/src/configguignokii.h +++ b/kitchensync/src/configguignokii.h @@ -37,7 +37,7 @@ class ConfigGuiGnokii : public ConfigGui TQ_OBJECT public: - ConfigGuiGnokii( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiGnokii( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp index 260552642..118aed14a 100644 --- a/kitchensync/src/configguigpe.cpp +++ b/kitchensync/src/configguigpe.cpp @@ -32,8 +32,8 @@ #include <klineedit.h> #include <klocale.h> -ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { initGUI(); diff --git a/kitchensync/src/configguigpe.h b/kitchensync/src/configguigpe.h index 0d4888f60..e1fc10c6e 100644 --- a/kitchensync/src/configguigpe.h +++ b/kitchensync/src/configguigpe.h @@ -32,7 +32,7 @@ class KLineEdit; class ConfigGuiGpe : public ConfigGui { public: - ConfigGuiGpe( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiGpe( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp index 8bff86fea..721c82d70 100644 --- a/kitchensync/src/configguiirmc.cpp +++ b/kitchensync/src/configguiirmc.cpp @@ -42,8 +42,8 @@ #include "configguiirmc.h" -ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { initGUI(); diff --git a/kitchensync/src/configguiirmc.h b/kitchensync/src/configguiirmc.h index 5fe5b454a..572b714cc 100644 --- a/kitchensync/src/configguiirmc.h +++ b/kitchensync/src/configguiirmc.h @@ -40,7 +40,7 @@ class ConfigGuiIRMC : public ConfigGui TQ_OBJECT public: - ConfigGuiIRMC( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiIRMC( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp index e284c3e76..b7a94c447 100644 --- a/kitchensync/src/configguijescs.cpp +++ b/kitchensync/src/configguijescs.cpp @@ -30,8 +30,8 @@ #include <kdialog.h> #include <klocale.h> -ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { initGUI(); } diff --git a/kitchensync/src/configguijescs.h b/kitchensync/src/configguijescs.h index 6884bbbd7..1667900c9 100644 --- a/kitchensync/src/configguijescs.h +++ b/kitchensync/src/configguijescs.h @@ -30,7 +30,7 @@ class TQCheckBox; class ConfigGuiJescs : public ConfigGui { public: - ConfigGuiJescs( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiJescs( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp index b5ebd02ea..fd9dad4b6 100644 --- a/kitchensync/src/configguildap.cpp +++ b/kitchensync/src/configguildap.cpp @@ -32,8 +32,8 @@ #include <klineedit.h> #include <klocale.h> -ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { initGUI(); diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h index 1db94357f..07d97f09d 100644 --- a/kitchensync/src/configguildap.h +++ b/kitchensync/src/configguildap.h @@ -39,7 +39,7 @@ class ConfigGuiLdap : public ConfigGui TQ_OBJECT public: - ConfigGuiLdap( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiLdap( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp index b9ec2342c..e461a808f 100644 --- a/kitchensync/src/configguimoto.cpp +++ b/kitchensync/src/configguimoto.cpp @@ -29,8 +29,8 @@ #include <kdialog.h> #include <klocale.h> -ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { initGUI(); } diff --git a/kitchensync/src/configguimoto.h b/kitchensync/src/configguimoto.h index 1c5cd0f0e..cd588facf 100644 --- a/kitchensync/src/configguimoto.h +++ b/kitchensync/src/configguimoto.h @@ -29,7 +29,7 @@ class KLineEdit; class ConfigGuiMoto : public ConfigGui { public: - ConfigGuiMoto( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiMoto( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp index c2b3be2ec..c74623345 100644 --- a/kitchensync/src/configguiopie.cpp +++ b/kitchensync/src/configguiopie.cpp @@ -30,8 +30,8 @@ #include <tqlineedit.h> #include <tqspinbox.h> -ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { TQGridLayout *tqlayout = new TQGridLayout( topLayout() ); diff --git a/kitchensync/src/configguiopie.h b/kitchensync/src/configguiopie.h index b798de93c..e90f4acfe 100644 --- a/kitchensync/src/configguiopie.h +++ b/kitchensync/src/configguiopie.h @@ -30,7 +30,7 @@ class TQSpinBox; class ConfigGuiOpie : public ConfigGui { public: - ConfigGuiOpie( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiOpie( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp index 688e0cc0d..03d87cdb4 100644 --- a/kitchensync/src/configguipalm.cpp +++ b/kitchensync/src/configguipalm.cpp @@ -35,8 +35,8 @@ #include "configguipalm.h" -ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { initGUI(); diff --git a/kitchensync/src/configguipalm.h b/kitchensync/src/configguipalm.h index 86c797a07..354e5a29f 100644 --- a/kitchensync/src/configguipalm.h +++ b/kitchensync/src/configguipalm.h @@ -33,7 +33,7 @@ class TQSpinBox; class ConfigGuiPalm : public ConfigGui { public: - ConfigGuiPalm( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiPalm( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); TQString save() const; diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp index b77ce93ba..d51101aeb 100644 --- a/kitchensync/src/configguisunbird.cpp +++ b/kitchensync/src/configguisunbird.cpp @@ -40,8 +40,8 @@ #include <klocale.h> #include <kfile.h> -ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { TQTabWidget *tabWidget = new TQTabWidget( this ); topLayout()->addWidget( tabWidget ); @@ -209,14 +209,14 @@ void ConfigGuiSunbird::delWebdavCalendar( WebdavCalendar *calendar ) calendar->deleteLater(); } -LocalCalendar::LocalCalendar( TQWidget *tqparent ) - : TQWidget( tqparent ) +LocalCalendar::LocalCalendar( TQWidget *parent ) + : TQWidget( parent ) { initGui(); } -LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *tqparent ) - : TQWidget( tqparent ) +LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *parent ) + : TQWidget( parent ) { initGui(); @@ -275,15 +275,15 @@ void LocalCalendar::deleteWidget() emit deleteRequest( this ); } -WebdavCalendar::WebdavCalendar( TQWidget *tqparent ) - : TQWidget( tqparent ) +WebdavCalendar::WebdavCalendar( TQWidget *parent ) + : TQWidget( parent ) { initGui(); }; WebdavCalendar::WebdavCalendar( const TQString &username, const TQString &password, const TQString &url, - const TQString &defaultcal, const TQString &days, TQWidget *tqparent ) - : TQWidget( tqparent ) + const TQString &defaultcal, const TQString &days, TQWidget *parent ) + : TQWidget( parent ) { initGui(); diff --git a/kitchensync/src/configguisunbird.h b/kitchensync/src/configguisunbird.h index 25ac78a9f..5095a4e02 100644 --- a/kitchensync/src/configguisunbird.h +++ b/kitchensync/src/configguisunbird.h @@ -42,10 +42,10 @@ class LocalCalendar : public TQWidget TQ_OBJECT public: - LocalCalendar( TQWidget *tqparent = 0 ); + LocalCalendar( TQWidget *parent = 0 ); LocalCalendar( const TQString &path, const TQString &defaultcal, - const TQString &days, TQWidget *tqparent = 0 ); + const TQString &days, TQWidget *parent = 0 ); KURLRequester *mPathRequester; TQCheckBox *mDaysCheckBox; @@ -69,12 +69,12 @@ class WebdavCalendar : public TQWidget TQ_OBJECT public: - WebdavCalendar( TQWidget *tqparent = 0 ); + WebdavCalendar( TQWidget *parent = 0 ); WebdavCalendar( const TQString &username, const TQString &password, const TQString &url, const TQString &defaultcal, - const TQString &days, TQWidget *tqparent = 0 ); + const TQString &days, TQWidget *parent = 0 ); KLineEdit *mUrl; TQCheckBox *mDaysCheckBox; @@ -100,7 +100,7 @@ class ConfigGuiSunbird : public ConfigGui TQ_OBJECT public: - ConfigGuiSunbird( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiSunbird( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp index 5ff5aeacc..898300769 100644 --- a/kitchensync/src/configguisynce.cpp +++ b/kitchensync/src/configguisynce.cpp @@ -30,8 +30,8 @@ #include <kdialog.h> #include <klocale.h> -ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { initGUI(); } diff --git a/kitchensync/src/configguisynce.h b/kitchensync/src/configguisynce.h index fb318f9d0..680b1b128 100644 --- a/kitchensync/src/configguisynce.h +++ b/kitchensync/src/configguisynce.h @@ -31,7 +31,7 @@ class KLineEdit; class ConfigGuiSynce : public ConfigGui { public: - ConfigGuiSynce( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiSynce( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp index 3e1dac1aa..26a8c2241 100644 --- a/kitchensync/src/configguisyncmlhttp.cpp +++ b/kitchensync/src/configguisyncmlhttp.cpp @@ -35,8 +35,8 @@ #include <tqtabwidget.h> #include <tqvbox.h> -ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ), mUrl( 0 ), mPort( 0 ) +ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ), mUrl( 0 ), mPort( 0 ) { TQTabWidget *tabWidget = new TQTabWidget( this ); @@ -137,12 +137,12 @@ ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget topLayout()->addStretch( 1 ); } -void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row ) +void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ) { - TQLabel *label = new TQLabel( text, tqparent); + TQLabel *label = new TQLabel( text, parent); mGridLayout->addWidget( label, row, 0 ); - *edit = new KComboBox( true, tqparent ); + *edit = new KComboBox( true, parent ); mGridLayout->addWidget( *edit, row, 1 ); } diff --git a/kitchensync/src/configguisyncmlhttp.h b/kitchensync/src/configguisyncmlhttp.h index de71586d5..accff70e8 100644 --- a/kitchensync/src/configguisyncmlhttp.h +++ b/kitchensync/src/configguisyncmlhttp.h @@ -39,7 +39,7 @@ class ConfigGuiSyncmlHttp : public ConfigGui TQ_OBJECT public: - ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *tqparent ); + ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *parent ); void load( const TQString &xml ); TQString save() const; @@ -62,7 +62,7 @@ class ConfigGuiSyncmlHttp : public ConfigGui KComboBox *mNoteDb; protected slots: - void addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row ); + void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ); }; #endif diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp index 1bb4bdaf1..61833b4eb 100644 --- a/kitchensync/src/configguisyncmlobex.cpp +++ b/kitchensync/src/configguisyncmlobex.cpp @@ -37,8 +37,8 @@ #include <tqtabwidget.h> #include <tqvbox.h> -ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *tqparent ) - : ConfigGui( member, tqparent ) +ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *parent ) + : ConfigGui( member, parent ) { TQTabWidget *tabWidget = new TQTabWidget( this ); topLayout()->addWidget( tabWidget ); @@ -308,12 +308,12 @@ TQString ConfigGuiSyncmlObex::save() const return xml; } -void ConfigGuiSyncmlObex::addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row ) +void ConfigGuiSyncmlObex::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ) { - TQLabel *label = new TQLabel( text, tqparent ); + TQLabel *label = new TQLabel( text, parent ); mGridLayout->addWidget( label, row, 0 ); - *edit = new KComboBox( true, tqparent ); + *edit = new KComboBox( true, parent ); mGridLayout->addWidget( *edit, row, 1 ); } diff --git a/kitchensync/src/configguisyncmlobex.h b/kitchensync/src/configguisyncmlobex.h index a4e427474..7ee4d3f30 100644 --- a/kitchensync/src/configguisyncmlobex.h +++ b/kitchensync/src/configguisyncmlobex.h @@ -41,7 +41,7 @@ class ConfigGuiSyncmlObex : public ConfigGui TQ_OBJECT public: - ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *tqparent = 0 ); + ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *parent = 0 ); void load( const TQString &xml ); TQString save() const; @@ -82,7 +82,7 @@ class ConfigGuiSyncmlObex : public ConfigGui KComboBox *mNoteDb; protected slots: - void addLineEdit( TQWidget *tqparent, const TQString &text, KComboBox **edit, int row ); + void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ); }; #endif diff --git a/kitchensync/src/conflictdialog.cpp b/kitchensync/src/conflictdialog.cpp index c3e236ccc..39943ffe4 100644 --- a/kitchensync/src/conflictdialog.cpp +++ b/kitchensync/src/conflictdialog.cpp @@ -20,7 +20,7 @@ #include "conflictdialog.h" -ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ) - : TQDialog( tqparent ), mMapping( mapping ) +ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) + : TQDialog( parent ), mMapping( mapping ) { } diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h index 81c91138b..2e48c0390 100644 --- a/kitchensync/src/conflictdialog.h +++ b/kitchensync/src/conflictdialog.h @@ -31,7 +31,7 @@ class ConflictDialog : public TQDialog { public: - ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ); + ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); protected: QSync::SyncMapping mMapping; diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp index f6157b6fa..bb25c271d 100644 --- a/kitchensync/src/connectionwidgets.cpp +++ b/kitchensync/src/connectionwidgets.cpp @@ -40,8 +40,8 @@ #include "connectionwidgets.h" -BluetoothWidget::BluetoothWidget( TQWidget *tqparent ) - : TQWidget( tqparent ) +BluetoothWidget::BluetoothWidget( TQWidget *parent ) + : TQWidget( parent ) { TQGridLayout *tqlayout = new TQGridLayout( this ); @@ -100,8 +100,8 @@ TQString BluetoothWidget::channel() const } // FIXME - Only IrMC specific -IRWidget::IRWidget( TQWidget *tqparent ) - : TQWidget( tqparent ) +IRWidget::IRWidget( TQWidget *parent ) + : TQWidget( parent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 ); @@ -122,10 +122,10 @@ IRWidget::IRWidget( TQWidget *tqparent ) tqlayout->setRowStretch( 2, 1 ); } -void IRWidget::load( const TQDomElement &tqparent ) +void IRWidget::load( const TQDomElement &parent ) { TQDomNode node; - for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) { + for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement element = node.toElement(); if ( element.tagName() == "irname" ) mDevice->setText( element.text() ); @@ -134,20 +134,20 @@ void IRWidget::load( const TQDomElement &tqparent ) } } -void IRWidget::save( TQDomDocument &doc, TQDomElement &tqparent ) +void IRWidget::save( TQDomDocument &doc, TQDomElement &parent ) { TQDomElement element = doc.createElement( "irname" ); element.appendChild( doc.createTextNode( mDevice->text() ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); element = doc.createElement( "irserial" ); element.appendChild( doc.createTextNode( mSerialNumber->text() ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } // FIXME - Only IrMC specific -CableWidget::CableWidget( TQWidget *tqparent ) - : TQWidget( tqparent ) +CableWidget::CableWidget( TQWidget *parent ) + : TQWidget( parent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 ); @@ -176,10 +176,10 @@ CableWidget::CableWidget( TQWidget *tqparent ) mDevice->insertItem( "/dev/ttyUSB1" ); } -void CableWidget::load( const TQDomElement &tqparent ) +void CableWidget::load( const TQDomElement &parent ) { TQDomNode node; - for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) { + for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement element = node.toElement(); if ( element.tagName() == "cabletype" ) mManufacturer->setCurrentItem( element.text().toInt() ); @@ -188,19 +188,19 @@ void CableWidget::load( const TQDomElement &tqparent ) } } -void CableWidget::save( TQDomDocument &doc, TQDomElement &tqparent ) +void CableWidget::save( TQDomDocument &doc, TQDomElement &parent ) { TQDomElement element = doc.createElement( "cabletype" ); element.appendChild( doc.createTextNode( TQString::number( mManufacturer->currentItem() ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); element = doc.createElement( "cabledev" ); element.appendChild( doc.createTextNode( mDevice->currentText() ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } -UsbWidget::UsbWidget( TQWidget *tqparent ) - : TQWidget( tqparent ) +UsbWidget::UsbWidget( TQWidget *parent ) + : TQWidget( parent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3); diff --git a/kitchensync/src/connectionwidgets.h b/kitchensync/src/connectionwidgets.h index 5ffc9bc5e..ec514cb44 100644 --- a/kitchensync/src/connectionwidgets.h +++ b/kitchensync/src/connectionwidgets.h @@ -41,7 +41,7 @@ class BluetoothWidget : public TQWidget TQ_OBJECT public: - BluetoothWidget( TQWidget *tqparent ); + BluetoothWidget( TQWidget *parent ); void hideChannel(); void showChannel(); @@ -63,7 +63,7 @@ class IRWidget : public TQWidget TQ_OBJECT public: - IRWidget( TQWidget *tqparent ); + IRWidget( TQWidget *parent ); void load( const TQDomElement& ); void save( TQDomDocument&, TQDomElement& ); @@ -76,7 +76,7 @@ class IRWidget : public TQWidget class CableWidget : public TQWidget { public: - CableWidget( TQWidget *tqparent ); + CableWidget( TQWidget *parent ); void load( const TQDomElement& ); void save( TQDomDocument&, TQDomElement& ); @@ -89,7 +89,7 @@ class CableWidget : public TQWidget class UsbWidget : public TQWidget { public: - UsbWidget( TQWidget *tqparent ); + UsbWidget( TQWidget *parent ); int interface() const; void setInterface( int interface ); diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp index f8f16988c..99ff35fdb 100644 --- a/kitchensync/src/groupconfig.cpp +++ b/kitchensync/src/groupconfig.cpp @@ -41,8 +41,8 @@ #include <tqlayout.h> #include <tqpushbutton.h> -GroupConfig::GroupConfig( TQWidget *tqparent ) - : TQWidget( tqparent ) +GroupConfig::GroupConfig( TQWidget *parent ) + : TQWidget( parent ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); diff --git a/kitchensync/src/groupconfig.h b/kitchensync/src/groupconfig.h index be19641dc..151fe7948 100644 --- a/kitchensync/src/groupconfig.h +++ b/kitchensync/src/groupconfig.h @@ -37,7 +37,7 @@ class GroupConfig : public TQWidget TQ_OBJECT public: - GroupConfig( TQWidget *tqparent ); + GroupConfig( TQWidget *parent ); void setSyncProcess( SyncProcess *process ); diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp index cda75c8cf..5a0cf49d8 100644 --- a/kitchensync/src/groupconfigcommon.cpp +++ b/kitchensync/src/groupconfigcommon.cpp @@ -38,8 +38,8 @@ #include "groupconfigcommon.h" -ObjectTypeSelector::ObjectTypeSelector( TQWidget *tqparent ) - : TQWidget( tqparent ) +ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent ) + : TQWidget( parent ) { TQGridLayout *tqlayout = new TQGridLayout( this ); tqlayout->setMargin( 0 ); @@ -125,8 +125,8 @@ void ObjectTypeSelector::save( QSync::Group group ) config.setActiveObjectTypes( objectTypes ); } -GroupConfigCommon::GroupConfigCommon( TQWidget *tqparent ) - : TQWidget( tqparent ) +GroupConfigCommon::GroupConfigCommon( TQWidget *parent ) + : TQWidget( parent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kitchensync/src/groupconfigcommon.h b/kitchensync/src/groupconfigcommon.h index b406d4519..8b298316f 100644 --- a/kitchensync/src/groupconfigcommon.h +++ b/kitchensync/src/groupconfigcommon.h @@ -33,7 +33,7 @@ class TQCheckBox; class ObjectTypeSelector : public TQWidget { public: - ObjectTypeSelector( TQWidget *tqparent ); + ObjectTypeSelector( TQWidget *parent ); void load( const QSync::Group &group ); void save( QSync::Group group ); @@ -45,7 +45,7 @@ class ObjectTypeSelector : public TQWidget class GroupConfigCommon : public TQWidget { public: - GroupConfigCommon( TQWidget *tqparent ); + GroupConfigCommon( TQWidget *parent ); void setSyncProcess( SyncProcess *syncProcess ); void save(); diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp index bf48ce210..4d8be65d0 100644 --- a/kitchensync/src/groupconfigdialog.cpp +++ b/kitchensync/src/groupconfigdialog.cpp @@ -26,8 +26,8 @@ #include <tqlayout.h> -GroupConfigDialog::GroupConfigDialog( TQWidget *tqparent, SyncProcess *process ) - : KDialogBase( tqparent, 0, true, i18n("Configure Synchronization Group"), +GroupConfigDialog::GroupConfigDialog( TQWidget *parent, SyncProcess *process ) + : KDialogBase( parent, 0, true, i18n("Configure Synchronization Group"), Ok ) { TQFrame *topFrame = makeMainWidget(); diff --git a/kitchensync/src/groupconfigdialog.h b/kitchensync/src/groupconfigdialog.h index 712f627ae..2871853c6 100644 --- a/kitchensync/src/groupconfigdialog.h +++ b/kitchensync/src/groupconfigdialog.h @@ -31,7 +31,7 @@ class GroupConfigDialog : public KDialogBase TQ_OBJECT public: - GroupConfigDialog( TQWidget *tqparent, SyncProcess * ); + GroupConfigDialog( TQWidget *parent, SyncProcess * ); ~GroupConfigDialog(); protected slots: diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp index 71a8deff9..3a294f5ba 100644 --- a/kitchensync/src/groupitem.cpp +++ b/kitchensync/src/groupitem.cpp @@ -40,8 +40,8 @@ #include "groupitem.h" -GroupItem::GroupItem( KWidgetList *tqparent, SyncProcess *process ) - : KWidgetListItem( tqparent ), mSyncProcess( process ), +GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) + : KWidgetListItem( parent ), mSyncProcess( process ), mCallbackHandler( new QSync::CallbackHandler ), mProcessedItems( 0 ), mMaxProcessedItems( 0 ), mSynchronizing( false ) @@ -345,9 +345,9 @@ void GroupItem::engineChanged( QSync::Engine *engine ) this->update(); } -MemberItem::MemberItem( TQWidget *tqparent, SyncProcess *process, +MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, const QSync::Member &member ) - : TQWidget( tqparent ), mSyncProcess( process ), mMember( member ) + : TQWidget( parent ), mSyncProcess( process ), mMember( member ) { TQFont boldFont; boldFont.setBold( true ); diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h index 0202f13d9..524fa0369 100644 --- a/kitchensync/src/groupitem.h +++ b/kitchensync/src/groupitem.h @@ -91,7 +91,7 @@ class GroupItem : public KWidgetListItem class MemberItem : public TQWidget { public: - MemberItem( TQWidget *tqparent, SyncProcess *syncProcess, + MemberItem( TQWidget *parent, SyncProcess *syncProcess, const QSync::Member &member ); SyncProcess* syncProcess() const { return mSyncProcess; } diff --git a/kitchensync/src/groupview.cpp b/kitchensync/src/groupview.cpp index d7afdf10d..8e1adf87e 100644 --- a/kitchensync/src/groupview.cpp +++ b/kitchensync/src/groupview.cpp @@ -26,8 +26,8 @@ #include "groupview.h" -GroupView::GroupView( TQWidget *tqparent ) - : TQWidget( tqparent ), mAboutPage( 0 ) +GroupView::GroupView( TQWidget *parent ) + : TQWidget( parent ), mAboutPage( 0 ) { mLayout = new TQVBoxLayout( this ); diff --git a/kitchensync/src/groupview.h b/kitchensync/src/groupview.h index 88f8da21f..b3891f675 100644 --- a/kitchensync/src/groupview.h +++ b/kitchensync/src/groupview.h @@ -32,7 +32,7 @@ class GroupView : public TQWidget TQ_OBJECT public: - GroupView( TQWidget *tqparent ); + GroupView( TQWidget *parent ); SyncProcess* selectedSyncProcess() const; diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp index 9094216ee..3a05641dd 100644 --- a/kitchensync/src/htmldiffalgodisplay.cpp +++ b/kitchensync/src/htmldiffalgodisplay.cpp @@ -30,8 +30,8 @@ static TQString textToHTML( const TQString &text ) return TQStyleSheet::convertFromPlainText( text ); } -HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *tqparent ) - : KTextBrowser( tqparent ) +HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent ) + : KTextBrowser( parent ) { setWrapPolicy( TQTextEdit::AtWordBoundary ); setVScrollBarMode( TQScrollView::AlwaysOff ); diff --git a/kitchensync/src/htmldiffalgodisplay.h b/kitchensync/src/htmldiffalgodisplay.h index f7964e18c..b3d52259f 100644 --- a/kitchensync/src/htmldiffalgodisplay.h +++ b/kitchensync/src/htmldiffalgodisplay.h @@ -32,7 +32,7 @@ namespace KSync { class HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser { public: - HTMLDiffAlgoDisplay( TQWidget *tqparent ); + HTMLDiffAlgoDisplay( TQWidget *parent ); void begin(); void end(); diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp index 89008f06f..396e144f6 100644 --- a/kitchensync/src/kwidgetlist.cpp +++ b/kitchensync/src/kwidgetlist.cpp @@ -38,8 +38,8 @@ class KWidgetList::Private TQVBox *mBox; }; -KWidgetList::KWidgetList( TQWidget *tqparent, const char *name ) - : TQScrollView( tqparent, name ), +KWidgetList::KWidgetList( TQWidget *parent, const char *name ) + : TQScrollView( parent, name ), d( new Private ) { d->mBox = new TQVBox( viewport() ); @@ -256,8 +256,8 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event ) return TQScrollView::eventFilter( object, event ); } -KWidgetListItem::KWidgetListItem( KWidgetList *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KWidgetListItem::KWidgetListItem( KWidgetList *parent, const char *name ) + : TQWidget( parent, name ) { mForegroundColor = KGlobalSettings::textColor(); mBackgroundColor = KGlobalSettings::baseColor(); diff --git a/kitchensync/src/kwidgetlist.h b/kitchensync/src/kwidgetlist.h index 89586b891..9fb4915c7 100644 --- a/kitchensync/src/kwidgetlist.h +++ b/kitchensync/src/kwidgetlist.h @@ -32,7 +32,7 @@ class KWidgetList : public TQScrollView TQ_OBJECT public: - KWidgetList( TQWidget *tqparent = 0, const char *name = 0 ); + KWidgetList( TQWidget *parent = 0, const char *name = 0 ); ~KWidgetList(); uint count() const; @@ -70,7 +70,7 @@ class KWidgetList : public TQScrollView class KWidgetListItem : public TQWidget { public: - KWidgetListItem( KWidgetList *tqparent, const char *name = 0 ); + KWidgetListItem( KWidgetList *parent, const char *name = 0 ); ~KWidgetListItem(); void setSelected( bool selected ); diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp index c6da7a3ab..c2216546c 100644 --- a/kitchensync/src/memberconfig.cpp +++ b/kitchensync/src/memberconfig.cpp @@ -30,8 +30,8 @@ #include <tqlayout.h> #include <tqtabwidget.h> -MemberConfig::MemberConfig( TQWidget *tqparent, const QSync::Member &member ) - : TQWidget( tqparent ), mMember( member ) +MemberConfig::MemberConfig( TQWidget *parent, const QSync::Member &member ) + : TQWidget( parent ), mMember( member ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/kitchensync/src/memberconfig.h b/kitchensync/src/memberconfig.h index 2e20e63ee..2abc4f4c2 100644 --- a/kitchensync/src/memberconfig.h +++ b/kitchensync/src/memberconfig.h @@ -33,7 +33,7 @@ class MemberConfig : public TQWidget TQ_OBJECT public: - MemberConfig( TQWidget *tqparent, const QSync::Member & ); + MemberConfig( TQWidget *parent, const QSync::Member & ); ~MemberConfig(); void loadData(); diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp index 35679392d..e7c037610 100644 --- a/kitchensync/src/multiconflictdialog.cpp +++ b/kitchensync/src/multiconflictdialog.cpp @@ -33,8 +33,8 @@ class ChangeItem : public KWidgetListItem { public: - ChangeItem( KWidgetList *tqparent, const QSync::SyncChange &change ) - : KWidgetListItem( tqparent ), + ChangeItem( KWidgetList *parent, const QSync::SyncChange &change ) + : KWidgetListItem( parent ), mChange( change ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); @@ -71,8 +71,8 @@ class ChangeItem : public KWidgetListItem QSync::SyncChange mChange; }; -MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ) - : ConflictDialog( mapping, tqparent ) +MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) + : ConflictDialog( mapping, parent ) { initGUI(); diff --git a/kitchensync/src/multiconflictdialog.h b/kitchensync/src/multiconflictdialog.h index fd0cdef53..8709ee63a 100644 --- a/kitchensync/src/multiconflictdialog.h +++ b/kitchensync/src/multiconflictdialog.h @@ -31,7 +31,7 @@ class MultiConflictDialog : public ConflictDialog TQ_OBJECT public: - MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ); + MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); ~MultiConflictDialog(); private slots: diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index 70163b421..f66eece63 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -37,9 +37,9 @@ typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory; K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory ) KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList& ) - : KParts::ReadOnlyPart( tqparent, name ) + : KParts::ReadOnlyPart( parent, name ) { setInstance( KitchenSyncFactory::instance() ); diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h index 14d612610..eeb113c98 100644 --- a/kitchensync/src/part.h +++ b/kitchensync/src/part.h @@ -34,7 +34,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart public: KitchenSyncPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList& ); + TQObject *parent, const char *name, const TQStringList& ); virtual ~KitchenSyncPart(); static KAboutData *createAboutData(); diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp index 10f311f9d..d8d6c46d5 100644 --- a/kitchensync/src/pluginpicker.cpp +++ b/kitchensync/src/pluginpicker.cpp @@ -57,8 +57,8 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin ) } -PluginPicker::PluginPicker( TQWidget *tqparent ) - : TQWidget( tqparent ) +PluginPicker::PluginPicker( TQWidget *parent ) + : TQWidget( parent ) { TQBoxLayout *tqlayout = new TQVBoxLayout( this ); @@ -94,8 +94,8 @@ QSync::Plugin PluginPicker::selectedPlugin() const } -PluginPickerDialog::PluginPickerDialog( TQWidget *tqparent ) - : KDialogBase( tqparent, 0, true, i18n("Select Member Type"), Ok | Cancel ) +PluginPickerDialog::PluginPickerDialog( TQWidget *parent ) + : KDialogBase( parent, 0, true, i18n("Select Member Type"), Ok | Cancel ) { TQFrame *topFrame = makeMainWidget(); @@ -114,9 +114,9 @@ QSync::Plugin PluginPickerDialog::selectedPlugin() const return mPicker->selectedPlugin(); } -QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *tqparent ) +QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *parent ) { - PluginPickerDialog dlg( tqparent ); + PluginPickerDialog dlg( parent ); if ( dlg.exec() ) return dlg.selectedPlugin(); else diff --git a/kitchensync/src/pluginpicker.h b/kitchensync/src/pluginpicker.h index fbaed3f26..44564ddb6 100644 --- a/kitchensync/src/pluginpicker.h +++ b/kitchensync/src/pluginpicker.h @@ -45,7 +45,7 @@ class PluginPicker : public TQWidget TQ_OBJECT public: - PluginPicker( TQWidget *tqparent ); + PluginPicker( TQWidget *parent ); QSync::Plugin selectedPlugin() const; @@ -65,11 +65,11 @@ class PluginPickerDialog : public KDialogBase TQ_OBJECT public: - PluginPickerDialog( TQWidget *tqparent ); + PluginPickerDialog( TQWidget *parent ); QSync::Plugin selectedPlugin() const; - static QSync::Plugin getPlugin( TQWidget *tqparent ); + static QSync::Plugin getPlugin( TQWidget *parent ); protected slots: void slotOk(); diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp index c70402795..f9228e174 100644 --- a/kitchensync/src/singleconflictdialog.cpp +++ b/kitchensync/src/singleconflictdialog.cpp @@ -32,8 +32,8 @@ #include "singleconflictdialog.h" -SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ) - : ConflictDialog( mapping, tqparent ), mDiffAlgo( 0 ) +SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) + : ConflictDialog( mapping, parent ), mDiffAlgo( 0 ) { initGUI(); diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h index 9c80f7fc6..249620c2d 100644 --- a/kitchensync/src/singleconflictdialog.h +++ b/kitchensync/src/singleconflictdialog.h @@ -36,7 +36,7 @@ class SingleConflictDialog : public ConflictDialog TQ_OBJECT public: - SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ); + SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); ~SingleConflictDialog(); private slots: diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index ab2391090..cc1111582 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -527,7 +527,7 @@ class SortCacheItem: folder) messages is cached on disk in a file named .$FOLDER.index.sorted so if, for example the name of a folder is foo, the associated sorting cache file would be called ".foo.index.sorted". - For each message, its serial number, that of its tqparent, the length of its + For each message, its serial number, that of its parent, the length of its sorting key, and the key itself are written to this file. At the start of the file several per folder counts and flags are cached additionally, immediately after a short file headers. The entries from the start of the @@ -544,13 +544,13 @@ class SortCacheItem: What is used for figuring out threading? - messages can have an In-Reply-To header that contains the message id of - another message. This is called a perfect tqparent. + another message. This is called a perfect parent. - additionally there is the References header which, if present, holds a list of message ids that the current message is a follow up to. We currently use the second to last entry in that list only. See further down for the reasoning behind that. - If the above two fail and the message is prefixed (Re: foo, Fwd: foo etc.) - an attempt is made to find a tqparent by looking for messages with the same + an attempt is made to find a parent by looking for messages with the same subject. How that is done is explained below as well. For all these comparisons of header contents, the md5 hashes of the headers @@ -578,22 +578,22 @@ Strategy: has been moved away in the meantime (possibly by outside forces such as other clients) and a deleted counter is incremented and all further processing stopped for this message. - The messages tqparent serial number, as read from the sorted file is then - used to look up the tqparent and reset it to -1 should it not be in the + The messages parent serial number, as read from the sorted file is then + used to look up the parent and reset it to -1 should it not be in the current folder anymore. -1 and -2 are special values that can show up - as tqparent serial numbers and are used to encode the following: - -1 means this message has no perfect tqparent, a tqparent for it needs to + as parent serial numbers and are used to encode the following: + -1 means this message has no perfect parent, a parent for it needs to be found from among the other messages, if there is a suitable one -2 means this message is top level and will forever stay so, no need - to even try to find a tqparent. This is also used for the non-threaded + to even try to find a parent. This is also used for the non-threaded 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 + In case there is a perfect parent, the current sort cache item is appended to the parents list of unsorted tqchildren, or to that of 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 + for the parent, if it is not already there. Messages with a parent of -1 are appended to the "unparented" list, which is later traversed and - its elements threaded. Messages with -2 as the tqparent are tqchildren of + its elements threaded. Messages with -2 as the parent 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 @@ -612,7 +612,7 @@ Strategy: well. 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 + had a parent 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 unparented messages is then traversed and findParent() called for each @@ -638,7 +638,7 @@ Strategy: - since the above is a common special case, it is worth trying. I think. ;) - If the tqparent found is perfect (In-Reply-To), the sort cache items is marked + If the parent found is perfect (In-Reply-To), the sort cache items is marked as such. mIsImperfectlyThreaded is used for that purposer, we will soon see why that flag is needed. @@ -647,29 +647,29 @@ Strategy: 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 parents for - threading by subjects. These lists are sorted by date, so the tqparent closest + threading by subjects. These lists are sorted by date, so the parent 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 from hard corner cases such as cvs commit lists, for which subject threading makes little sense anyhow and where it should be turned off), but also since the messages should be roughly pre sorted by date in the store already. Some cursory benchmarking supports that assumption. - If now a tqparent is needed for a message with a certain subject, the list of + If now a parent is needed for a message with a certain subject, the list of top level messages with that subject is traversed and the first one that is - older than our message is chosen as it's tqparent. Parents more than six weeks + older than our message is chosen as it's parent. Parents more than six weeks older than the message are not accepted. The reasoning being that if a new message with the same subject turns up after such a long time, the chances that it is still part of the same thread are slim. The value of six weeks is chosen as a result of a poll conducted on #kde-devel, so it's probably bogus. :) All of this happens in the aptly named: findParentBySubject(). - Everthing that still has no tqparent after this ends up at toplevel, no further + Everthing that still has no parent after this ends up at toplevel, no further attemp is made at finding one. If you are reading this because you want to implement threading by body search or somesuch, please go away, I don't like you. :) Ok, so far we have only operated on sort cache items, nothing ui wise has - happened yet. Now that we have established the tqparent/child relations of all + happened yet. Now that we have established the parent/child relations of all messages, it's time to create HeaderItems for them for use in the header list. But wait, you say, what about sorting? Wouldn't it make sense to do that first? Exactly, you're a clever bugger, ey? Here, have a cookie. ;) @@ -706,14 +706,14 @@ What happens when a message arrives in the folder? structures described above are updated accordingly. If threading is enabled, the new message is threaded using the same findParent and findParentBySubject methods used on folder open. If the message ends up in a watched or ignored - thread, those status bits are inherited from the tqparent. The message is also + thread, those status bits are inherited from the parent. 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 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 + considered as a new parent for each item on it. This is especially important to ensure that parents arriving out of order after their tqchildren still end 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 @@ -735,7 +735,7 @@ What happens when a message is removed from the folder? mented. Then a list of tqchildren of the message is assembled containing those tqchildren that have to be reparented now that our message has gone away. If one of those tqchildren has been marked as toBeDeleted, it is simply added to - root at top level, because there is no need to find a tqparent for it if it is + root at top level, because there is no need to find a parent for it if it is to go away as well. This is an optimization to avoid rethreading all messages in a thread when deleting several messages in a thread, or even the whole thread. The KMMoveCommand marks all messages that will be moved out of @@ -743,7 +743,7 @@ What happens when a message is removed from the folder? can be avoided. Note that that does not work when moving messages via filter action. - That list of tqchildren is then traversed and a new tqparent found for each one + That list of tqchildren is then traversed and a new parent found for each one using, again, findParent and findParentBySubject. When a message becomes imperfectly threaded in the process, it is added to the corresponding list. diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp index 252a49c86..7ae3d2a37 100644 --- a/kmail/accountcombobox.cpp +++ b/kmail/accountcombobox.cpp @@ -34,8 +34,8 @@ using namespace KMail; -AccountComboBox::AccountComboBox( TQWidget* tqparent, const char* name ) - : TQComboBox( tqparent, name ) +AccountComboBox::AccountComboBox( TQWidget* parent, const char* name ) + : TQComboBox( parent, name ) { connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ), this, TQT_SLOT( slotRefreshAccounts() ) ); diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h index 04a8bc07c..48c5d6a8b 100644 --- a/kmail/accountcombobox.h +++ b/kmail/accountcombobox.h @@ -45,7 +45,7 @@ class AccountComboBox : public TQComboBox TQ_OBJECT public: - AccountComboBox( TQWidget* tqparent, const char* name = 0 ); + AccountComboBox( TQWidget* parent, const char* name = 0 ); void setCurrentAccount( KMAccount* account ); KMAccount* currentAccount() const; diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index de168cebb..93616ac8f 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -268,8 +268,8 @@ ProcmailRCParser::expandVars(const TQString &s) AccountDialog::AccountDialog( const TQString & caption, KMAccount *account, - TQWidget *tqparent, const char *name, bool modal ) - : KDialogBase( tqparent, name, modal, caption, Ok|Cancel|Help, Ok, true ), + TQWidget *parent, const char *name, bool modal ) + : KDialogBase( parent, name, modal, caption, Ok|Cancel|Help, Ok, true ), mAccount( account ), mServerTest( 0 ), mCurCapa( AllCapa ), @@ -2267,8 +2267,8 @@ void AccountDialog::slotEditSharedNamespace() } } -NamespaceLineEdit::NamespaceLineEdit( TQWidget* tqparent ) - : KLineEdit( tqparent ) +NamespaceLineEdit::NamespaceLineEdit( TQWidget* parent ) + : KLineEdit( parent ) { } @@ -2278,9 +2278,9 @@ void NamespaceLineEdit::setText( const TQString& text ) KLineEdit::setText( text ); } -NamespaceEditDialog::NamespaceEditDialog( TQWidget *tqparent, +NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, ImapAccountBase::imapNamespace type, ImapAccountBase::nsDelimMap* map ) - : KDialogBase( tqparent, "edit_namespace", false, TQString(), + : KDialogBase( parent, "edit_namespace", false, TQString(), Ok|Cancel, Ok, true ), mType( type ), mNamespaceMap( map ) { TQVBox *page = makeVBoxMainWidget(); diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h index 060b576a0..8a65d418f 100644 --- a/kmail/accountdialog.h +++ b/kmail/accountdialog.h @@ -59,7 +59,7 @@ class AccountDialog : public KDialogBase public: AccountDialog( const TQString & caption, KMAccount *account, - TQWidget *tqparent=0, const char *name=0, bool modal=true ); + TQWidget *parent=0, const char *name=0, bool modal=true ); virtual ~AccountDialog(); private: struct LocalWidgets @@ -306,7 +306,7 @@ class NamespaceLineEdit: public KLineEdit TQ_OBJECT public: - NamespaceLineEdit( TQWidget* tqparent ); + NamespaceLineEdit( TQWidget* parent ); const TQString& lastText() { return mLastText; } @@ -323,7 +323,7 @@ class NamespaceEditDialog: public KDialogBase TQ_OBJECT public: - NamespaceEditDialog( TQWidget* tqparent, ImapAccountBase::imapNamespace type, + NamespaceEditDialog( TQWidget* parent, ImapAccountBase::imapNamespace type, ImapAccountBase::nsDelimMap* map ); protected slots: diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index be69edd0f..6a188fbb5 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -81,8 +81,8 @@ class AccountTypeBox : public KListBox public: enum Type { Local, POP3, IMAP, dIMAP, Maildir }; - AccountTypeBox( TQWidget *tqparent ) - : KListBox( tqparent, "AccountTypeBox" ) + AccountTypeBox( TQWidget *parent ) + : KListBox( parent, "AccountTypeBox" ) { mTypeList << i18n( "Local mailbox" ); mTypeList << i18n( "POP3" ); @@ -107,8 +107,8 @@ class AccountTypeBox : public KListBox TQStringList mTypeList; }; -AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *tqparent ) - : KWizard( tqparent, "KWizard" ), mKernel( kernel ), +AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent ) + : KWizard( parent, "KWizard" ), mKernel( kernel ), mAccount( 0 ), mTransportInfo( 0 ), mServerTest( 0 ) { setupWelcomePage(); @@ -118,12 +118,12 @@ AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *tqparent ) setupServerInformationPage(); } -void AccountWizard::start( KMKernel *kernel, TQWidget *tqparent ) +void AccountWizard::start( KMKernel *kernel, TQWidget *parent ) { KConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" ); if ( wizardConfig.readBoolEntry( "ShowOnStartup", true ) ) { - AccountWizard wizard( kernel, tqparent ); + AccountWizard wizard( kernel, parent ); int result = wizard.exec(); if ( result == TQDialog::Accepted ) { wizardConfig.writeEntry( "ShowOnStartup", false ); diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h index 6a05fc655..6e77dd6e6 100644 --- a/kmail/accountwizard.h +++ b/kmail/accountwizard.h @@ -53,9 +53,9 @@ class AccountWizard : public KWizard run successfully before. @param kernel The mail kernel the wizard should work on. - @param tqparent The tqparent widget of the dialog. + @param parent The parent widget of the dialog. */ - static void start( KMKernel *kernel, TQWidget *tqparent = 0 ); + static void start( KMKernel *kernel, TQWidget *parent = 0 ); /** Reimplemented @@ -63,7 +63,7 @@ class AccountWizard : public KWizard void showPage( TQWidget *page ); protected: - AccountWizard( KMKernel *kernel, TQWidget *tqparent ); + AccountWizard( KMKernel *kernel, TQWidget *parent ); ~AccountWizard() {}; void setupWelcomePage(); diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp index 913245e99..71475a93d 100644 --- a/kmail/actionscheduler.cpp +++ b/kmail/actionscheduler.cpp @@ -421,7 +421,7 @@ void ActionScheduler::fetchMessage() } else if (msg) { fetchTimeOutTime = TQTime::currentTime(); fetchTimeOutTimer->start( 60 * 1000, true ); - FolderJob *job = msg->tqparent()->createJob( msg ); + FolderJob *job = msg->parent()->createJob( msg ); connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )), TQT_SLOT(messageFetched( KMMessage* )) ); lastJob = job; @@ -461,8 +461,8 @@ void ActionScheduler::messageFetched( KMMessage *msg ) } else { fetchMessageTimer->start( 0, true ); } - if (mFetchUnget && msg->tqparent()) - msg->tqparent()->unGetMsg( msg->tqparent()->find( msg )); + if (mFetchUnget && msg->parent()) + msg->parent()->unGetMsg( msg->parent()->find( msg )); return; } @@ -562,7 +562,7 @@ void ActionScheduler::processMessage() return; } if (msg) { - FolderJob *job = msg->tqparent()->createJob( msg ); + FolderJob *job = msg->parent()->createJob( msg ); connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )), TQT_SLOT(messageRetrieved( KMMessage* )) ); job->start(); @@ -665,7 +665,7 @@ void ActionScheduler::moveMessage() if (mOriginalSerNum) orgMsg = message( mOriginalSerNum ); mResult = mOldReturnCode; // ignore errors in deleting original message - if (!orgMsg || !orgMsg->tqparent()) { + if (!orgMsg || !orgMsg->parent()) { // Original message is gone, no point filtering it anymore mSrcFolder->removeMsg( mSrcFolder->find( msg ) ); kdDebug(5006) << "The original serial number is missing. " @@ -675,11 +675,11 @@ void ActionScheduler::moveMessage() return; } else { if (!folder) // no filter folder specified leave in current place - folder = orgMsg->tqparent(); + folder = orgMsg->parent(); } mIgnore = true; - assert( msg->tqparent() == mSrcFolder.operator->() ); + assert( msg->parent() == mSrcFolder.operator->() ); mSrcFolder->take( mSrcFolder->find( msg ) ); mSrcFolder->addMsg( msg ); mIgnore = false; @@ -719,7 +719,7 @@ void ActionScheduler::moveMessageFinished( KMCommand *command ) mResult = mOldReturnCode; // ignore errors in deleting original message KMCommand *cmd = 0; - if (msg && msg->tqparent()) { + if (msg && msg->parent()) { cmd = new KMMoveCommand( 0, msg ); // cmd->start(); // Note: sensitive logic here. } diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index dccca6a89..4091c715c 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -57,8 +57,8 @@ using namespace KMail; AntiSpamWizard::AntiSpamWizard( WizardMode mode, - TQWidget* tqparent, KMFolderTree * mainFolderTree ) - : KWizard( tqparent ), + TQWidget* parent, KMFolderTree * mainFolderTree ) + : KWizard( parent ), mInfoPage( 0 ), mSpamRulesPage( 0 ), mVirusRulesPage( 0 ), @@ -830,9 +830,9 @@ void AntiSpamWizard::ConfigReader::sortToolList() //--------------------------------------------------------------------------- -ASWizPage::ASWizPage( TQWidget * tqparent, const char * name, +ASWizPage::ASWizPage( TQWidget * parent, const char * name, const TQString *bannerName ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { TQString banner = "kmwizard.png"; if ( bannerName && !bannerName->isEmpty() ) @@ -852,8 +852,8 @@ ASWizPage::ASWizPage( TQWidget * tqparent, const char * name, //--------------------------------------------------------------------------- ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, - TQWidget * tqparent, const char * name ) - : ASWizPage( tqparent, name ) + TQWidget * parent, const char * name ) + : ASWizPage( parent, name ) { TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); @@ -936,9 +936,9 @@ void ASWizInfoPage::processSelectionChange() //--------------------------------------------------------------------------- -ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * tqparent, const char * name, +ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ) - : ASWizPage( tqparent, name ) + : ASWizPage( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout ); @@ -1059,9 +1059,9 @@ void ASWizSpamRulesPage::allowUnsureFolderSelection( bool enabled ) //--------------------------------------------------------------------------- -ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * tqparent, const char * name, +ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ) - : ASWizPage( tqparent, name ) + : ASWizPage( parent, name ) { TQGridLayout *grid = new TQGridLayout( mLayout, 5, 1, KDialog::spacingHint() ); @@ -1135,8 +1135,8 @@ void ASWizVirusRulesPage::processSelectionChange() //--------------------------------------------------------------------------- -ASWizSummaryPage::ASWizSummaryPage( TQWidget * tqparent, const char * name ) - : ASWizPage( tqparent, name ) +ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name ) + : ASWizPage( parent, name ) { TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h index a17e341a2..04ec41046 100644 --- a/kmail/antispamwizard.h +++ b/kmail/antispamwizard.h @@ -115,13 +115,13 @@ namespace KMail { /** Constructor that needs to initialize from the main folder tree of KMail. @param mode The mode the wizard should run in. - @param tqparent The tqparent widget for the wizard. + @param parent The parent widget for the wizard. @param mainFolderTree The main folder tree from which the folders are copied to allow the selection of a spam folder in a tree within one of the wizard pages. */ AntiSpamWizard( WizardMode mode, - TQWidget * tqparent, KMFolderTree * mainFolderTree ); + TQWidget * parent, KMFolderTree * mainFolderTree ); protected: /** @@ -284,7 +284,7 @@ namespace KMail { class ASWizPage : public TQWidget { public: - ASWizPage( TQWidget *tqparent, const char *name, + ASWizPage( TQWidget *parent, const char *name, const TQString *bannerName = 0); protected: @@ -303,7 +303,7 @@ namespace KMail { public: ASWizInfoPage( AntiSpamWizard::WizardMode mode, - TQWidget *tqparent, const char *name ); + TQWidget *parent, const char *name ); void setScanProgressText( const TQString &toolName ); void addAvailableTool( const TQString &visibleName ); @@ -329,7 +329,7 @@ namespace KMail { TQ_OBJECT public: - ASWizSpamRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree ); + ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ); bool markAsReadSelected() const; bool moveSpamSelected() const; @@ -362,7 +362,7 @@ namespace KMail { TQ_OBJECT public: - ASWizVirusRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree ); + ASWizVirusRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ); bool pipeRulesSelected() const; bool moveRulesSelected() const; @@ -389,7 +389,7 @@ namespace KMail { TQ_OBJECT public: - ASWizSummaryPage( TQWidget * tqparent, const char * name ); + ASWizSummaryPage( TQWidget * parent, const char * name ); void setSummaryText( const TQString & text ); diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index f6cfac629..21c345fb3 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -49,11 +49,11 @@ static TQString standardArchivePath( const TQString &folderName ) "_" + TQDate::tqcurrentDate().toString( Qt::ISODate ) + ".tar.bz2"; } -ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *tqparent ) - : KDialogBase( tqparent, "archive_folder_dialog", false, i18n( "Archive Folder" ), +ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) + : KDialogBase( parent, "archive_folder_dialog", false, i18n( "Archive Folder" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), - mParentWidget( tqparent ) + mParentWidget( parent ) { TQWidget *mainWidget = new TQWidget( this ); TQGridLayout *mainLayout = new TQGridLayout( mainWidget ); diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h index cc4699594..b38d0aeea 100644 --- a/kmail/archivefolderdialog.h +++ b/kmail/archivefolderdialog.h @@ -37,7 +37,7 @@ class ArchiveFolderDialog : public KDialogBase public: - ArchiveFolderDialog( TQWidget *tqparent = 0 ); + ArchiveFolderDialog( TQWidget *parent = 0 ); void setFolder( KMFolder *defaultFolder ); protected slots: diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp index 7eebbbb22..18e8ddafa 100644 --- a/kmail/attachmentlistview.cpp +++ b/kmail/attachmentlistview.cpp @@ -47,9 +47,9 @@ using KPIM::MailListDrag; namespace KMail { AttachmentListView::AttachmentListView( KMail::Composer * composer, - TQWidget* tqparent, + TQWidget* parent, const char* name ) - : KListView( tqparent, name ), + : KListView( parent, name ), mComposer( composer ) { setAcceptDrops( true ); diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h index a25d792e8..3f1f83fea 100644 --- a/kmail/attachmentlistview.h +++ b/kmail/attachmentlistview.h @@ -32,7 +32,7 @@ class AttachmentListView : public KListView Q_OBJECT TQ_OBJECT public: - AttachmentListView( KMail::Composer * composer = 0, TQWidget* tqparent = 0, + AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0, const char* name = 0 ); virtual ~AttachmentListView(); diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp index e3a2ac0dd..43209ca7b 100644 --- a/kmail/backupjob.cpp +++ b/kmail/backupjob.cpp @@ -36,12 +36,12 @@ using namespace KMail; -BackupJob::BackupJob( TQWidget *tqparent ) - : TQObject( tqparent ), +BackupJob::BackupJob( TQWidget *parent ) + : TQObject( parent ), mArchiveType( Zip ), mRootFolder( 0 ), mArchive( 0 ), - mParentWidget( tqparent ), + mParentWidget( parent ), mCurrentFolderOpen( false ), mArchivedMessages( 0 ), mArchivedSize( 0 ), @@ -236,8 +236,8 @@ void BackupJob::archiveNextMessage() mCurrentMessage = message; TQTimer::singleShot( 0, this, TQT_SLOT( processCurrentMessage() ) ); } - else if ( message->tqparent() ) { - mCurrentJob = message->tqparent()->createJob( message ); + else if ( message->parent() ) { + mCurrentJob = message->parent()->createJob( message ); mCurrentJob->setCancellable( false ); connect( mCurrentJob, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), this, TQT_SLOT( messageRetrieved( KMMessage* ) ) ); @@ -247,7 +247,7 @@ void BackupJob::archiveNextMessage() } else { kdWarning(5006) << "Message with subject " << mCurrentMessage->subject() - << " is neither complete nor has a tqparent!" << endl; + << " is neither complete nor has a parent!" << endl; abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." ) .tqarg( mCurrentFolder->name() ) ); } diff --git a/kmail/backupjob.h b/kmail/backupjob.h index 500e671ac..7a56be172 100644 --- a/kmail/backupjob.h +++ b/kmail/backupjob.h @@ -55,7 +55,7 @@ class BackupJob : public TQObject // These enum values have to stay in sync with the format combobox of ArchiveFolderDialog! enum ArchiveType { Zip = 0, Tar = 1, TarBz2 = 2, TarGz = 3 }; - explicit BackupJob( TQWidget *tqparent = 0 ); + explicit BackupJob( TQWidget *parent = 0 ); ~BackupJob(); void setRootFolder( KMFolder *rootFolder ); void setSaveLocation( const KURL &savePath ); diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp index 8a40d7443..04b7a98b8 100644 --- a/kmail/bodyvisitor.cpp +++ b/kmail/bodyvisitor.cpp @@ -76,9 +76,9 @@ namespace KMail { while ( (part = it.current()) != 0 ) { ++it; - // skip this part if the tqparent part is already loading - if ( part->tqparent() && - selected.contains( part->tqparent() ) && + // skip this part if the parent part is already loading + if ( part->parent() && + selected.contains( part->parent() ) && part->loadPart() ) continue; @@ -114,7 +114,7 @@ namespace KMail { headerCheck = false; // check whether to load this part or not: - // look at the basic list, ask the subclass and check the tqparent + // look at the basic list, ask the subclass and check the parent if ( mBasicList.contains( part->originalContentTypeStr() ) || parentNeedsLoading( part ) || addPartToList( part ) ) @@ -142,13 +142,13 @@ namespace KMail { KMMessagePart *part = msgPart; while ( part ) { - if ( part->tqparent() && - ( part->tqparent()->originalContentTypeStr() == "MULTIPART/SIGNED" || + if ( part->parent() && + ( part->parent()->originalContentTypeStr() == "MULTIPART/SIGNED" || ( msgPart->originalContentTypeStr() == "APPLICATION/OCTET-STREAM" && - part->tqparent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) ) + part->parent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) ) return true; - part = part->tqparent(); + part = part->parent(); } return false; } diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index d13382511..6dcae58c1 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -534,8 +534,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) } // make copy of setting, to reset it before potentially destroying 'it' - bool silentUpload = static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->silentUpload(); - static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->setSilentUpload( false ); + bool silentUpload = static_cast<KMFolderCachedImap*>((*it).parent->storage())->silentUpload(); + static_cast<KMFolderCachedImap*>((*it).parent->storage())->setSilentUpload( false ); if ( job->error() && !silentUpload ) { TQString myError = "<p><b>" + i18n("Error while uploading folder") @@ -549,7 +549,7 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) return; } else { KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>( (*it).current->storage() ); - KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).tqparent->storage() ); + KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).parent->storage() ); Q_ASSERT( storage ); Q_ASSERT( parentStorage ); if ( storage->imapPath().isEmpty() ) { @@ -581,9 +581,9 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) url.setPath( path ); if ( mAccount->groupwareType() != KMAcctCachedImap::GroupwareScalix ) { - // Associate the jobData with the tqparent folder, not with the child + // Associate the jobData with the parent folder, not with the child // This is necessary in case of an error while creating the subfolder, - // so that folderComplete is called on the tqparent (and the sync resetted). + // so that folderComplete is called on the parent (and the sync resetted). ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); jd.items << folder->label(); // for the err msg jd.current = folder->folder(); @@ -679,7 +679,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job) if( job->error() ) { mErrorCode = job->error(); - mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).tqparent->label() ) + '\n' ); + mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).parent->label() ) + '\n' ); delete this; return; } @@ -892,9 +892,9 @@ void CachedImapJob::slotListMessagesResult( KIO::Job * job ) } //----------------------------------------------------------------------------- -void CachedImapJob::setParentFolder( const KMFolderCachedImap* tqparent ) +void CachedImapJob::setParentFolder( const KMFolderCachedImap* parent ) { - mParentFolder = const_cast<KMFolderCachedImap*>( tqparent ); + mParentFolder = const_cast<KMFolderCachedImap*>( parent ); } } diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h index cf9dab57e..9931df701 100644 --- a/kmail/cachedimapjob.h +++ b/kmail/cachedimapjob.h @@ -95,7 +95,7 @@ public: virtual ~CachedImapJob(); - void setParentFolder( const KMFolderCachedImap* tqparent ); + void setParentFolder( const KMFolderCachedImap* parent ); signals: // only emitted for uid validity checking jobs with PERMANENTFLAGS responses diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index d88c3164b..475ddd44f 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -7,10 +7,10 @@ #include <tqlayout.h> #include <tqlabel.h> -ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption, +ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& caption, const TQStringList& keys, const TQString& currentKey, const TQString& lastOptions ) - : KDialogBase( tqparent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true ) + : KDialogBase( parent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true ) { TQWidget *page = makeMainWidget(); diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h index 3402fd370..d136305fc 100644 --- a/kmail/chiasmuskeyselector.h +++ b/kmail/chiasmuskeyselector.h @@ -12,7 +12,7 @@ class ChiasmusKeySelector : public KDialogBase TQ_OBJECT public: - ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption, + ChiasmusKeySelector( TQWidget* parent, const TQString& caption, const TQStringList& keys, const TQString& currentKey, const TQString& lastOptions ); diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp index a0ebc8253..a813a910d 100644 --- a/kmail/colorlistbox.cpp +++ b/kmail/colorlistbox.cpp @@ -29,8 +29,8 @@ #include "colorlistbox.h" -ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f ) - :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1) +ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) + :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) { connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); setAcceptDrops( true); diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h index bb9e5b171..384647f65 100644 --- a/kmail/colorlistbox.h +++ b/kmail/colorlistbox.h @@ -29,7 +29,7 @@ class ColorListBox : public KListBox TQ_OBJECT public: - ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 ); + ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 ); void setColor( uint index, const TQColor &color ); TQColor color( uint index ) const; signals: diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index c0d775cf2..771f7a755 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -214,9 +214,9 @@ namespace { } -ConfigureDialog::ConfigureDialog( TQWidget *tqparent, const char *name, bool modal ) +ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal ) : KCMultiDialog( KDialogBase::IconList, KGuiItem( i18n( "&Load Profile..." ) ), - KGuiItem(), User2, i18n( "Configure" ), tqparent, name, modal ) + KGuiItem(), User2, i18n( "Configure" ), parent, name, modal ) , mProfileDialog( 0 ) { KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); @@ -284,8 +284,8 @@ TQString IdentityPage::helpAnchor() const { return TQString::tqfromLatin1("configure-identity"); } -IdentityPage::IdentityPage( TQWidget * tqparent, const char * name ) - : ConfigModule( tqparent, name ), +IdentityPage::IdentityPage( TQWidget * parent, const char * name ) + : ConfigModule( parent, name ), mIdentityDialog( 0 ) { TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); @@ -555,8 +555,8 @@ TQString AccountsPage::helpAnchor() const { return TQString::tqfromLatin1("configure-accounts"); } -AccountsPage::AccountsPage( TQWidget * tqparent, const char * name ) - : ConfigModuleWithTabs( tqparent, name ) +AccountsPage::AccountsPage( TQWidget * parent, const char * name ) + : ConfigModuleWithTabs( parent, name ) { // // "Receiving" tab: @@ -581,8 +581,8 @@ TQString AccountsPage::SendingTab::helpAnchor() const { return TQString::tqfromLatin1("configure-accounts-sending"); } -AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { mTransportInfoList.setAutoDelete( true ); // temp. vars: @@ -1056,8 +1056,8 @@ TQString AccountsPage::ReceivingTab::helpAnchor() const { return TQString::tqfromLatin1("configure-accounts-receiving"); } -AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab ( tqparent, name ) +AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name ) + : ConfigModuleTab ( parent, name ) { // temp. vars: TQVBoxLayout *vlay; @@ -1481,8 +1481,8 @@ TQString AppearancePage::helpAnchor() const { return TQString::tqfromLatin1("configure-appearance"); } -AppearancePage::AppearancePage( TQWidget * tqparent, const char * name ) - : ConfigModuleWithTabs( tqparent, name ) +AppearancePage::AppearancePage( TQWidget * parent, const char * name ) + : ConfigModuleWithTabs( parent, name ) { // // "Fonts" tab: @@ -1551,8 +1551,8 @@ static const struct { }; static const int numFontNames = sizeof fontNames / sizeof *fontNames; -AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ), mActiveFontIndex( -1 ) +AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ), mActiveFontIndex( -1 ) { assert( numFontNames == sizeof mFont / sizeof *mFont ); // tmp. vars: @@ -1729,8 +1729,8 @@ static const struct { }; static const int numColorNames = sizeof colorNames / sizeof *colorNames; -AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -1900,8 +1900,8 @@ static const EnumConfigEntry readerWindowMode = { readerWindowModes, DIM(readerWindowModes), 1 }; -AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { // tmp. vars: TQVBoxLayout * vlay; @@ -1992,8 +1992,8 @@ static const struct { static const int numDateDisplayConfig = sizeof dateDisplayConfig / sizeof *dateDisplayConfig; -AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ), +AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ), mCustomDateFormatEdit( 0 ) { // tmp. vars: @@ -2249,9 +2249,9 @@ TQString AppearancePage::ReaderTab::helpAnchor() const { return TQString::tqfromLatin1("configure-appearance-reader"); } -AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * tqparent, +AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( tqparent, name ) + : ConfigModuleTab( parent, name ) { TQVBoxLayout *vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -2475,9 +2475,9 @@ TQString AppearancePage::SystemTrayTab::helpAnchor() const { return TQString::tqfromLatin1("configure-appearance-systemtray"); } -AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * tqparent, +AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( tqparent, name ) + : ConfigModuleTab( parent, name ) { TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -2540,8 +2540,8 @@ TQString ComposerPage::helpAnchor() const { return TQString::tqfromLatin1("configure-composer"); } -ComposerPage::ComposerPage( TQWidget * tqparent, const char * name ) - : ConfigModuleWithTabs( tqparent, name ) +ComposerPage::ComposerPage( TQWidget * parent, const char * name ) + : ConfigModuleWithTabs( parent, name ) { // // "General" tab: @@ -2599,8 +2599,8 @@ TQString ComposerPage::GeneralTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-general"); } -ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -2913,8 +2913,8 @@ TQString ComposerPage::PhrasesTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-phrases"); } -ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { // tmp. vars: TQGridLayout *glay; @@ -3125,8 +3125,8 @@ TQString ComposerPage::TemplatesTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-templates"); } -ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab ( tqparent, name ) +ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name ) + : ConfigModuleTab ( parent, name ) { TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -3149,8 +3149,8 @@ TQString ComposerPage::CustomTemplatesTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-custom-templates"); } -ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab ( tqparent, name ) +ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name ) + : ConfigModuleTab ( parent, name ) { TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -3173,8 +3173,8 @@ TQString ComposerPage::SubjectTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-subject"); } -ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -3257,8 +3257,8 @@ TQString ComposerPage::CharsetTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-charset"); } -ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -3352,8 +3352,8 @@ TQString ComposerPage::HeadersTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-headers"); } -ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -3567,9 +3567,9 @@ TQString ComposerPage::AttachmentsTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-attachments"); } -ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * tqparent, +ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( tqparent, name ) { + : ConfigModuleTab( parent, name ) { // tmp. vars: TQVBoxLayout *vlay; TQLabel *label; @@ -3672,8 +3672,8 @@ TQString SecurityPage::helpAnchor() const { return TQString::tqfromLatin1("configure-security"); } -SecurityPage::SecurityPage( TQWidget * tqparent, const char * name ) - : ConfigModuleWithTabs( tqparent, name ) +SecurityPage::SecurityPage( TQWidget * parent, const char * name ) + : ConfigModuleWithTabs( parent, name ) { // // "Reading" tab: @@ -3719,8 +3719,8 @@ TQString SecurityPage::GeneralTab::helpAnchor() const { return TQString::tqfromLatin1("configure-security-reading"); } -SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab ( tqparent, name ) +SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name ) + : ConfigModuleTab ( parent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -3996,8 +3996,8 @@ TQString SecurityPage::ComposerCryptoTab::helpAnchor() const { return TQString::tqfromLatin1("configure-security-composing"); } -SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab ( tqparent, name ) +SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name ) + : ConfigModuleTab ( parent, name ) { // the margins are inside mWidget itself TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 ); @@ -4071,8 +4071,8 @@ TQString SecurityPage::WarningTab::helpAnchor() const { return TQString::tqfromLatin1("configure-security-warnings"); } -SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { // the margins are inside mWidget itself TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 ); @@ -4180,8 +4180,8 @@ TQString SecurityPage::SMimeTab::helpAnchor() const { return TQString::tqfromLatin1("configure-security-smime-validation"); } -SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { // the margins are inside mWidget itself TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 ); @@ -4498,8 +4498,8 @@ TQString SecurityPage::CryptPlugTab::helpAnchor() const { return TQString::tqfromLatin1("configure-security-crypto-backends"); } -SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -4531,8 +4531,8 @@ TQString MiscPage::helpAnchor() const { return TQString::tqfromLatin1("configure-misc"); } -MiscPage::MiscPage( TQWidget * tqparent, const char * name ) - : ConfigModuleWithTabs( tqparent, name ) +MiscPage::MiscPage( TQWidget * parent, const char * name ) + : ConfigModuleWithTabs( parent, name ) { mFolderTab = new FolderTab(); addTab( mFolderTab, i18n("&Folders") ); @@ -4546,8 +4546,8 @@ TQString MiscPage::FolderTab::helpAnchor() const { return TQString::tqfromLatin1("configure-misc-folders"); } -MiscPageFolderTab::MiscPageFolderTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( tqparent, name ) +MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) + : ConfigModuleTab( parent, name ) { // temp. vars: TQVBoxLayout *vlay; @@ -4800,8 +4800,8 @@ TQString MiscPage::GroupwareTab::helpAnchor() const { return TQString::tqfromLatin1("configure-misc-groupware"); } -MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* tqparent, const char* name ) - : ConfigModuleTab( tqparent, name ) +MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) + : ConfigModuleTab( parent, name ) { TQBoxLayout* vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -4866,7 +4866,7 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* tqparent, const char* name this, TQT_SLOT( slotEmitChanged( void ) ) ); mFolderComboLabel = new TQLabel( mBox ); // text depends on storage format - toolTip = i18n( "Set the tqparent of the resource folders" ); + toolTip = i18n( "Set the parent of the resource folders" ); whatsThis = i18n( GlobalSettings::self()->theIMAPResourceFolderParentItem()->whatsThis().utf8() ); TQToolTip::add( mFolderComboLabel, toolTip ); TQWhatsThis::add( mFolderComboLabel, whatsThis ); diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h index a44f5db14..ece1d83fd 100644 --- a/kmail/configuredialog.h +++ b/kmail/configuredialog.h @@ -37,7 +37,7 @@ class ConfigureDialog : public KCMultiDialog TQ_OBJECT public: - ConfigureDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true ); + ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true ); ~ConfigureDialog(); signals: diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 7a8820236..a7fe20419 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -38,9 +38,9 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("New Identity"), + : KDialogBase( parent, name, modal, i18n("New Identity"), Ok|Cancel|Help, Ok, true ) { setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") ); @@ -122,9 +122,9 @@ void NewIdentityDialog::slotEnableOK( const TQString & proposedIdentityName ) { enableButtonOK( true ); } -ListView::ListView( TQWidget *tqparent, const char *name, +ListView::ListView( TQWidget *parent, const char *name, int visibleItem ) - : KListView( tqparent, name ) + : KListView( parent, name ) { setVisibleItem(visibleItem); } @@ -191,9 +191,9 @@ TQSize ListView::tqsizeHint() const static TQString flagPng = TQString::tqfromLatin1("/flag.png"); NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true ) + : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true ) { // tqlayout the page (a combobox with label): TQWidget *page = makeMainWidget(); @@ -244,8 +244,8 @@ TQString NewLanguageDialog::language() const } -LanguageComboBox::LanguageComboBox( bool rw, TQWidget *tqparent, const char *name ) - : TQComboBox( rw, tqparent, name ) +LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name ) + : TQComboBox( rw, parent, name ) { } @@ -284,8 +284,8 @@ void LanguageComboBox::setLanguage( const TQString & language ) // // -ProfileDialog::ProfileDialog( TQWidget * tqparent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true ) +ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal ) + : KDialogBase( parent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true ) { // tmp. vars: TQWidget * page = makeMainWidget(); @@ -364,9 +364,9 @@ void ProfileDialog::slotOk() { } -ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * tqparent, +ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * parent, const char * name ) - : ConfigModule( tqparent, name ) + : ConfigModule( parent, name ) { TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mTabWidget = new TQTabWidget( this ); diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index b1c34379a..455f8579f 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -84,7 +84,7 @@ public: enum DuplicateMode { Empty, ControlCenter, ExistingEntry }; NewIdentityDialog( const TQStringList & identities, - TQWidget *tqparent=0, const char *name=0, bool modal=true ); + TQWidget *parent=0, const char *name=0, bool modal=true ); TQString identityName() const { return mLineEdit->text(); } TQString duplicateIdentity() const { return mComboBox->currentText(); } @@ -127,7 +127,7 @@ class NewLanguageDialog : public KDialogBase TQ_OBJECT public: - NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *tqparent=0, + NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent=0, const char *name=0, bool modal=true ); TQString language() const; @@ -142,7 +142,7 @@ class LanguageComboBox : public TQComboBox TQ_OBJECT public: - LanguageComboBox( bool rw, TQWidget *tqparent=0, const char *name=0 ); + LanguageComboBox( bool rw, TQWidget *parent=0, const char *name=0 ); int insertLanguage( const TQString & language ); TQString language() const; void setLanguage( const TQString & language ); @@ -158,7 +158,7 @@ class ProfileDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - ProfileDialog( TQWidget * tqparent=0, const char * name=0, bool modal=false ); + ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false ); signals: void profileSelected( KConfig * profile ); @@ -180,8 +180,8 @@ class ConfigModule : public KCModule { Q_OBJECT TQ_OBJECT public: - ConfigModule( TQWidget * tqparent=0, const char * name=0 ) - : KCModule ( tqparent, name ) + ConfigModule( TQWidget * parent=0, const char * name=0 ) + : KCModule ( parent, name ) {} ~ConfigModule() {} @@ -208,8 +208,8 @@ class ConfigModuleTab : public TQWidget { Q_OBJECT TQ_OBJECT public: - ConfigModuleTab( TQWidget *tqparent=0, const char* name=0 ) - :TQWidget( tqparent, name ) + ConfigModuleTab( TQWidget *parent=0, const char* name=0 ) + :TQWidget( parent, name ) {} ~ConfigModuleTab() {} void load(); @@ -243,7 +243,7 @@ class ConfigModuleWithTabs : public ConfigModule { Q_OBJECT TQ_OBJECT public: - ConfigModuleWithTabs( TQWidget * tqparent=0, const char * name=0 ); + ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 ); ~ConfigModuleWithTabs() {} // don't reimplement any of those methods @@ -271,7 +271,7 @@ class KDE_EXPORT IdentityPage : public ConfigModule { Q_OBJECT TQ_OBJECT public: - IdentityPage( TQWidget * tqparent=0, const char * name=0 ); + IdentityPage( TQWidget * parent=0, const char * name=0 ); ~IdentityPage() {} TQString helpAnchor() const; @@ -322,7 +322,7 @@ class AccountsPageSendingTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - AccountsPageSendingTab( TQWidget * tqparent=0, const char * name=0 ); + AccountsPageSendingTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -360,7 +360,7 @@ class AccountsPageReceivingTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - AccountsPageReceivingTab( TQWidget * tqparent=0, const char * name=0 ); + AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 ); ~AccountsPageReceivingTab(); TQString helpAnchor() const; void save(); @@ -405,7 +405,7 @@ class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs { Q_OBJECT TQ_OBJECT public: - AccountsPage( TQWidget * tqparent=0, const char * name=0 ); + AccountsPage( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -433,7 +433,7 @@ class AppearancePageFontsTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - AppearancePageFontsTab( TQWidget * tqparent=0, const char * name=0 ); + AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -461,7 +461,7 @@ class AppearancePageColorsTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - AppearancePageColorsTab( TQWidget * tqparent=0, const char * name=0 ); + AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -483,7 +483,7 @@ class AppearancePageLayoutTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - AppearancePageLayoutTab( TQWidget * tqparent=0, const char * name=0 ); + AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -506,7 +506,7 @@ class AppearancePageHeadersTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - AppearancePageHeadersTab( TQWidget * tqparent=0, const char * name=0 ); + AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -533,7 +533,7 @@ class AppearancePageReaderTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - AppearancePageReaderTab( TQWidget * tqparent=0, const char * name=0 ); + AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -565,7 +565,7 @@ class AppearancePageSystemTrayTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - AppearancePageSystemTrayTab( TQWidget * tqparent=0, const char * name=0 ); + AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -584,7 +584,7 @@ class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs { Q_OBJECT TQ_OBJECT public: - AppearancePage( TQWidget * tqparent=0, const char * name=0 ); + AppearancePage( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -615,7 +615,7 @@ class ComposerPageGeneralTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - ComposerPageGeneralTab( TQWidget * tqparent=0, const char * name=0 ); + ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -649,7 +649,7 @@ class ComposerPagePhrasesTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - ComposerPagePhrasesTab( TQWidget * tqparent=0, const char * name=0 ); + ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -681,7 +681,7 @@ class ComposerPageTemplatesTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - ComposerPageTemplatesTab( TQWidget * tqparent=0, const char * name=0 ); + ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -699,7 +699,7 @@ class ComposerPageCustomTemplatesTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - ComposerPageCustomTemplatesTab( TQWidget * tqparent=0, const char * name=0 ); + ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -717,7 +717,7 @@ class ComposerPageSubjectTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - ComposerPageSubjectTab( TQWidget * tqparent=0, const char * name=0 ); + ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -736,7 +736,7 @@ class ComposerPageCharsetTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - ComposerPageCharsetTab( TQWidget * tqparent=0, const char * name=0 ); + ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -758,7 +758,7 @@ class ComposerPageHeadersTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - ComposerPageHeadersTab( TQWidget * tqparent=0, const char * name=0 ); + ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -791,7 +791,7 @@ class ComposerPageAttachmentsTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - ComposerPageAttachmentsTab( TQWidget * tqparent=0, const char * name=0 ); + ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -813,7 +813,7 @@ class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs { Q_OBJECT TQ_OBJECT public: - ComposerPage( TQWidget * tqparent=0, const char * name=0 ); + ComposerPage( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -848,7 +848,7 @@ class SecurityPageGeneralTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - SecurityPageGeneralTab( TQWidget * tqparent=0, const char * name=0 ); + SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -874,7 +874,7 @@ class SecurityPageComposerCryptoTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - SecurityPageComposerCryptoTab( TQWidget * tqparent=0, const char * name=0 ); + SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -894,7 +894,7 @@ class SecurityPageWarningTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - SecurityPageWarningTab( TQWidget * tqparent=0, const char * name=0 ); + SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -918,7 +918,7 @@ class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject { TQ_OBJECT K_DCOP public: - SecurityPageSMimeTab( TQWidget * tqparent=0, const char * name=0 ); + SecurityPageSMimeTab( TQWidget * parent=0, const char * name=0 ); ~SecurityPageSMimeTab(); TQString helpAnchor() const; @@ -945,7 +945,7 @@ class SecurityPageCryptPlugTab : public ConfigModuleTab Q_OBJECT TQ_OBJECT public: - SecurityPageCryptPlugTab( TQWidget * tqparent = 0, const char* name = 0 ); + SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 ); ~SecurityPageCryptPlugTab(); TQString helpAnchor() const; @@ -964,7 +964,7 @@ class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs { Q_OBJECT TQ_OBJECT public: - SecurityPage( TQWidget * tqparent=0, const char * name=0 ); + SecurityPage( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -996,7 +996,7 @@ class MiscPageFolderTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - MiscPageFolderTab( TQWidget * tqparent=0, const char * name=0 ); + MiscPageFolderTab( TQWidget * parent=0, const char * name=0 ); void save(); TQString helpAnchor() const; @@ -1027,7 +1027,7 @@ class MiscPageGroupwareTab : public ConfigModuleTab { Q_OBJECT TQ_OBJECT public: - MiscPageGroupwareTab( TQWidget * tqparent=0, const char * name=0 ); + MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 ); void save(); TQString helpAnchor() const; @@ -1069,7 +1069,7 @@ class KDE_EXPORT MiscPage : public ConfigModuleWithTabs { Q_OBJECT TQ_OBJECT public: - MiscPage( TQWidget * tqparent=0, const char * name=0 ); + MiscPage( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; typedef MiscPageFolderTab FolderTab; @@ -1090,7 +1090,7 @@ class ListView : public KListView { Q_OBJECT TQ_OBJECT public: - ListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 ); + ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 ); void resizeColums(); void setVisibleItem( int visibleItem, bool updateSize=true ); diff --git a/kmail/copyfolderjob.h b/kmail/copyfolderjob.h index 743d8b618..61726cdc3 100644 --- a/kmail/copyfolderjob.h +++ b/kmail/copyfolderjob.h @@ -55,7 +55,7 @@ public: /** * Create a new job * @param storage of the folder that should be copied - * @param newParent the target tqparent folder + * @param newParent the target parent folder */ CopyFolderJob( FolderStorage* const storage, KMFolderDir* const newParent = 0 ); @@ -70,7 +70,7 @@ public: protected slots: - /** Create the target directory under the new tqparent. Returns success or failure.*/ + /** Create the target directory under the new parent. Returns success or failure.*/ bool createTargetDir(); /** Copy all messages from the original folder to mNewFolder */ diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 4f1684907..279c71ae6 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -52,8 +52,8 @@ #include "customtemplates.h" -CustomTemplates::CustomTemplates( TQWidget *tqparent, const char *name ) - :CustomTemplatesBase( tqparent, name ), +CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) + :CustomTemplatesBase( parent, name ), mCurrentItem( 0 ), mBlockChangeSignal( false ) { diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h index 21695824a..c850723f8 100644 --- a/kmail/customtemplates.h +++ b/kmail/customtemplates.h @@ -43,7 +43,7 @@ class CustomTemplates : public CustomTemplatesBase public: - CustomTemplates( TQWidget *tqparent = 0, const char *name = 0 ); + CustomTemplates( TQWidget *parent = 0, const char *name = 0 ); ~CustomTemplates(); void load(); diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp index 85c82b928..6eb1b4934 100644 --- a/kmail/dictionarycombobox.cpp +++ b/kmail/dictionarycombobox.cpp @@ -42,8 +42,8 @@ namespace KMail { - DictionaryComboBox::DictionaryComboBox( TQWidget * tqparent, const char * name ) - : TQComboBox( false, tqparent, name ), + DictionaryComboBox::DictionaryComboBox( TQWidget * parent, const char * name ) + : TQComboBox( false, parent, name ), mSpellConfig( 0 ), mDefaultDictionary( 0 ) { diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h index 481605025..c847baa03 100644 --- a/kmail/dictionarycombobox.h +++ b/kmail/dictionarycombobox.h @@ -49,7 +49,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT public: - DictionaryComboBox( TQWidget * tqparent=0, const char * name=0 ); + DictionaryComboBox( TQWidget * parent=0, const char * name=0 ); ~DictionaryComboBox(); TQString currentDictionaryName() const; diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index 6ee1492a2..cc947e8eb 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -93,9 +93,9 @@ class DistributionListItem : public TQCheckListItem }; -DistributionListDialog::DistributionListDialog( TQWidget *tqparent ) +DistributionListDialog::DistributionListDialog( TQWidget *parent ) : KDialogBase( Plain, i18n("Save Distribution List"), User1 | Cancel, - User1, tqparent, 0, false, false, i18n("Save List") ) + User1, parent, 0, false, false, i18n("Save List") ) { TQFrame *topFrame = plainPage(); diff --git a/kmail/distributionlistdialog.h b/kmail/distributionlistdialog.h index 8d57b6dce..6643557c4 100644 --- a/kmail/distributionlistdialog.h +++ b/kmail/distributionlistdialog.h @@ -31,7 +31,7 @@ class KListView; class DistributionListDialog : public KDialogBase { public: - DistributionListDialog( TQWidget *tqparent ); + DistributionListDialog( TQWidget *parent ); void setRecipients( const Recipient::List & ); diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index ae12c1241..48facf1f4 100644 --- a/kmail/editorwatcher.cpp +++ b/kmail/editorwatcher.cpp @@ -49,8 +49,8 @@ using namespace KMail; EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith, - TQObject * tqparent, TQWidget *parentWidget) : - TQObject( tqparent ), + TQObject * parent, TQWidget *parentWidget) : + TQObject( parent ), mUrl( url ), mMimeType( mimeType ), mOpenWith( openWith ), @@ -127,11 +127,11 @@ void EditorWatcher::inotifyEvent() struct inotify_event *event = (struct inotify_event *) &buffer[offset]; size -= sizeof( struct inotify_event ) + event->len; offset += sizeof( struct inotify_event ) + event->len; - if ( event->tqmask & IN_OPEN ) + if ( event->mask & IN_OPEN ) mFileOpen = true; - if ( event->tqmask & IN_CLOSE ) + if ( event->mask & IN_CLOSE ) mFileOpen = false; - if ( event->tqmask & IN_MODIFY ) + if ( event->mask & IN_MODIFY ) mFileModified = true; } } diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h index daa35d8a8..d98faa4ec 100644 --- a/kmail/editorwatcher.h +++ b/kmail/editorwatcher.h @@ -42,13 +42,13 @@ class EditorWatcher : public TQObject public: /** * 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 parentWidget the tqparent widget of this EditorWatcher, which will be used as the tqparent + * @param parent the parent object of this EditorWatcher, which will take care of deleting + * this EditorWatcher if the parent is deleted. + * @param parentWidget the parent widget of this EditorWatcher, which will be used as the parent * widget for message dialogs. */ EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith, - TQObject *tqparent, TQWidget *parentWidget ); + TQObject *parent, TQWidget *parentWidget ); bool start(); bool fileChanged() const { return mFileModified; } signals: diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp index c43cefc18..e992eace5 100644 --- a/kmail/expirypropertiesdialog.cpp +++ b/kmail/expirypropertiesdialog.cpp @@ -23,7 +23,7 @@ using namespace KMail; /* - * Constructs a ExpiryPropertiesDialog as a child of 'tqparent', with the + * Constructs a ExpiryPropertiesDialog as a child of 'parent', with the * name 'name'. * */ diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 9de9271ef..148c2278f 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -49,8 +49,8 @@ using namespace KMail; -FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * tqparent, const TQString & name, KMFolder * folder) - : KMFolderTreeItem( tqparent, name, folder ), +FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, const TQString & name, KMFolder * folder) + : KMFolderTreeItem( parent, name, folder ), mOldName( folder->label() ) { // same stuff as in KMFolderTreeItem again, this time even with virtual methods working @@ -81,8 +81,8 @@ void FavoriteFolderViewItem::nameChanged() TQValueList<FavoriteFolderView*> FavoriteFolderView::mInstances; -FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * tqparent) : - FolderTreeBase( mainWidget, tqparent ), +FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * parent) : + FolderTreeBase( mainWidget, parent ), mContextMenuItem( 0 ), mReadingConfig( false ) { @@ -399,8 +399,8 @@ TQString FavoriteFolderView::prettyName(KMFolderTreeItem * fti) assert( fti->folder() ); TQString name = fti->folder()->label(); TQListViewItem *accountFti = fti; - while ( accountFti->tqparent() ) - accountFti = accountFti->tqparent(); + while ( accountFti->parent() ) + accountFti = accountFti->parent(); if ( fti->type() == KFolderTreeItem::Inbox ) { if ( fti->protocol() == KFolderTreeItem::Local || fti->protocol() == KFolderTreeItem::NONE ) { name = i18n( "Local Inbox" ); diff --git a/kmail/favoritefolderview.h b/kmail/favoritefolderview.h index e0e34d269..2119f13d8 100644 --- a/kmail/favoritefolderview.h +++ b/kmail/favoritefolderview.h @@ -30,7 +30,7 @@ class FavoriteFolderViewItem : public KMFolderTreeItem Q_OBJECT TQ_OBJECT public: - FavoriteFolderViewItem( FavoriteFolderView *tqparent, const TQString & name, KMFolder* folder ); + FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder ); protected: bool useTopLevelIcon() const { return false; } @@ -49,7 +49,7 @@ class FavoriteFolderView : public FolderTreeBase TQ_OBJECT public: - FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *tqparent = 0 ); + FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *parent = 0 ); ~FavoriteFolderView(); void readConfig(); diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index 3299d1dfc..d63278ad7 100644 --- a/kmail/filterimporterexporter.cpp +++ b/kmail/filterimporterexporter.cpp @@ -46,8 +46,8 @@ using namespace KMail; -FilterSelectionDialog::FilterSelectionDialog( TQWidget * tqparent ) - :KDialogBase( tqparent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ), +FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent ) + :KDialogBase( parent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ), wasCancelled( false ) { TQWidget *w = new TQWidget( this ); @@ -199,8 +199,8 @@ void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>& } -FilterImporterExporter::FilterImporterExporter( TQWidget* tqparent, bool popFilter ) -:mParent( tqparent), mPopFilter( popFilter ) +FilterImporterExporter::FilterImporterExporter( TQWidget* parent, bool popFilter ) +:mParent( parent), mPopFilter( popFilter ) { } diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h index 8c92e7692..0c11d34ba 100644 --- a/kmail/filterimporterexporter.h +++ b/kmail/filterimporterexporter.h @@ -47,7 +47,7 @@ namespace KMail class FilterImporterExporter { public: - FilterImporterExporter( TQWidget* tqparent, bool popFilter = false ); + FilterImporterExporter( TQWidget* parent, bool popFilter = false ); virtual ~FilterImporterExporter(); /** Export the given filter rules to a file which @@ -70,7 +70,7 @@ class FilterSelectionDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - FilterSelectionDialog( TQWidget * tqparent = 0 ); + FilterSelectionDialog( TQWidget * parent = 0 ); virtual ~FilterSelectionDialog(); virtual void slotCancel(); diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index c387b2e16..bd0d15d69 100644 --- a/kmail/filterlogdlg.cpp +++ b/kmail/filterlogdlg.cpp @@ -52,8 +52,8 @@ using namespace KMail; -FilterLogDialog::FilterLogDialog( TQWidget * tqparent ) -: KDialogBase( tqparent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ), +FilterLogDialog::FilterLogDialog( TQWidget * parent ) +: KDialogBase( parent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ), User1|User2|Close, Close, true, KStdGuiItem::clear(), KStdGuiItem::saveAs() ) { setWFlags( WDestructiveClose ); diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h index 927edb6e9..724c62140 100644 --- a/kmail/filterlogdlg.h +++ b/kmail/filterlogdlg.h @@ -52,7 +52,7 @@ namespace KMail { public: /** constructor */ - FilterLogDialog( TQWidget * tqparent ); + FilterLogDialog( TQWidget * parent ); protected slots: void slotLogEntryAdded( TQString logEntry ); diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp index bcd4201f7..d6dd6daae 100644 --- a/kmail/folderIface.cpp +++ b/kmail/folderIface.cpp @@ -136,7 +136,7 @@ FolderIface::messageRefs() for( int i = 0; i < messageCache.size(); ++i ) { KMMsgBase *msg = messageCache[i]; if ( msg ) { - KMMessage *fmsg = msg->tqparent()->getMsg( msg->tqparent()->find( msg ) ); + KMMessage *fmsg = msg->parent()->getMsg( msg->parent()->find( msg ) ); refList.append( DCOPRef( new MessageIface( fmsg ) ) ); } } diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 3b64254c5..5ba25472e 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -83,8 +83,8 @@ static const struct { }; -KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true /*modal*/, caption, +KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true /*modal*/, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true /*sep*/ ) , mUserIdFormat( userIdFormat ) { @@ -115,7 +115,7 @@ KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQSt } topLayout->setRowStretch(2, 10); - TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the tqparent folder." ), page ); + TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the parent folder." ), page ); topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 ); connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); @@ -192,7 +192,7 @@ unsigned int KMail::ACLEntryDialog::permissions() const // class KMail::FolderDiaACLTab::ListView : public KListView // { // public: -// ListView( TQWidget* tqparent, const char* name = 0 ) : KListView( tqparent, name ) {} +// ListView( TQWidget* parent, const char* name = 0 ) : KListView( parent, name ) {} // }; class KMail::FolderDiaACLTab::ListViewItem : public KListViewItem @@ -313,8 +313,8 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList, //// -KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name ) - : FolderDiaTab( tqparent, name ), +KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name ) + : FolderDiaTab( parent, name ), mImapAccount( 0 ), mUserRights( 0 ), mUserRightsState( KMail::ACLJobs::NotFetchedYet ), @@ -505,7 +505,7 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder ) void KMail::FolderDiaACLTab::startListing() { - // List ACLs of folder - or its tqparent, if creating a new folder + // List ACLs of folder - or its parent, if creating a new folder 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& )) ); @@ -754,7 +754,7 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f) KIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList ); ImapAccountBase::jobData jd; - jd.total = 1; jd.done = 0; jd.tqparent = 0; + jd.total = 1; jd.done = 0; jd.parent = 0; mImapAccount->insertJob(job, jd); connect(job, TQT_SIGNAL(result(KIO::Job *)), diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h index 855655174..901e12d1e 100644 --- a/kmail/folderdiaacltab.h +++ b/kmail/folderdiaacltab.h @@ -62,7 +62,7 @@ class ACLEntryDialog :public KDialogBase { TQ_OBJECT public: - ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name = 0 ); + ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name = 0 ); void setValues( const TQString& userId, unsigned int permissions ); @@ -90,7 +90,7 @@ class FolderDiaACLTab : public FolderDiaTab TQ_OBJECT public: - FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 ); + FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 ); virtual void load(); virtual bool save(); diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index 7c893851a..195a00b1f 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -50,8 +50,8 @@ using namespace KMail; -KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name ) - : FolderDiaTab( tqparent, name ), +KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name ) + : FolderDiaTab( parent, name ), mImapAccount( 0 ), mDlg( dlg ) { diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h index 570c7e82e..9d2d968db 100644 --- a/kmail/folderdiaquotatab.h +++ b/kmail/folderdiaquotatab.h @@ -56,7 +56,7 @@ class FolderDiaQuotaTab : public FolderDiaTab TQ_OBJECT public: - FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 ); + FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 ); virtual void load(); virtual bool save(); diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp index d8f8f44c4..859b31a67 100644 --- a/kmail/folderdiaquotatab_p.cpp +++ b/kmail/folderdiaquotatab_p.cpp @@ -51,8 +51,8 @@ using namespace KMail; struct QuotaInfo; -QuotaWidget::QuotaWidget( TQWidget* tqparent, const char* name ) - :TQWidget( tqparent, name ) +QuotaWidget::QuotaWidget( TQWidget* parent, const char* name ) + :TQWidget( parent, name ) { TQVBoxLayout *box = new TQVBoxLayout(this); TQWidget *stuff = new TQWidget( this ); diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h index 776ae1d76..669e21901 100644 --- a/kmail/folderdiaquotatab_p.h +++ b/kmail/folderdiaquotatab_p.h @@ -47,7 +47,7 @@ class QuotaWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - QuotaWidget( TQWidget* tqparent, const char* name = 0 ); + QuotaWidget( TQWidget* parent, const char* name = 0 ); virtual ~QuotaWidget() { } void setQuotaInfo( const KMail::QuotaInfo& info ); diff --git a/kmail/folderjob.h b/kmail/folderjob.h index 52778bb68..c3e54e684 100644 --- a/kmail/folderjob.h +++ b/kmail/folderjob.h @@ -53,21 +53,21 @@ public: tCopyMessage, tMoveMessage, tOther /* used by subclasses */ }; /** * Constructs a new job, operating on the message msg, of type - * @p jt and with a tqparent folder @p folder. + * @p jt and with a parent folder @p folder. */ FolderJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0, TQString partSpecifier = TQString() ); /** * Constructs a new job, operating on a message list @p msgList, - * set @sets, JobType @p jt and with the tqparent folder @p folder. + * set @sets, JobType @p jt and with the parent folder @p folder. * */ FolderJob( const TQPtrList<KMMessage>& msgList, const TQString& sets, JobType jt = tGetMessage, KMFolder *folder = 0 ); /** * This one should ONLY be used in derived folders, when a job - * does something internal and needs to construct an empty tqparent + * does something internal and needs to construct an empty parent * FolderJob */ FolderJob( JobType jt ); diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp index 93472437b..23636e365 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -41,8 +41,8 @@ namespace KMail { -FolderRequester::FolderRequester( TQWidget *tqparent, KMFolderTree *tree ) - : TQWidget( tqparent ), mFolder( 0 ), mFolderTree( tree ), +FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree ) + : TQWidget( parent ), mFolder( 0 ), mFolderTree( tree ), mMustBeReadWrite( true ), mShowOutbox( true ), mShowImapFolders( true ) { TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h index a13ab6d28..4c32aaf8d 100644 --- a/kmail/folderrequester.h +++ b/kmail/folderrequester.h @@ -51,10 +51,10 @@ namespace KMail { public: /** * Constructor - * @param tqparent the tqparent widget + * @param parent the parent widget * @param tree the KMFolderTree to get the folders */ - FolderRequester( TQWidget *tqparent, KMFolderTree* tree ); + FolderRequester( TQWidget *parent, KMFolderTree* tree ); virtual ~FolderRequester(); /** Returns selected folder */ diff --git a/kmail/foldersetselector.cpp b/kmail/foldersetselector.cpp index 8ae2618ec..c35fd0c1e 100644 --- a/kmail/foldersetselector.cpp +++ b/kmail/foldersetselector.cpp @@ -27,8 +27,8 @@ using namespace KMail; -FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * tqparent ) - : KDialogBase( tqparent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true ) +FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * parent ) + : KDialogBase( parent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true ) { assert( ft ); diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h index 97cc38602..9c352fc2b 100644 --- a/kmail/foldersetselector.h +++ b/kmail/foldersetselector.h @@ -32,7 +32,7 @@ class FolderSetSelector : public KDialogBase TQ_OBJECT public: - FolderSetSelector( KMFolderTree *ft, TQWidget *tqparent = 0 ); + FolderSetSelector( KMFolderTree *ft, TQWidget *parent = 0 ); TQValueList<int> selectedFolders(); void setSelectedFolders( const TQValueList<int> &folderIds ); diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp index f9bbed20d..9095a647b 100644 --- a/kmail/foldershortcutdialog.cpp +++ b/kmail/foldershortcutdialog.cpp @@ -53,9 +53,9 @@ using namespace KMail; FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder, KMMainWidget *mainwidget, - TQWidget *tqparent, + TQWidget *parent, const char *name ) -: KDialogBase( tqparent, name, true, +: KDialogBase( parent, name, true, i18n( "Shortcut for Folder %1" ).tqarg( folder->label() ), KDialogBase::Ok | KDialogBase::Cancel ), mFolder( folder ), mMainWidget( mainwidget ) diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h index da249e1a3..c3b760737 100644 --- a/kmail/foldershortcutdialog.h +++ b/kmail/foldershortcutdialog.h @@ -54,7 +54,7 @@ Q_OBJECT TQ_OBJECT public: FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw, - TQWidget *tqparent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); ~FolderShortcutDialog(); diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index 25fc6c0f0..63dc91fb5 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -301,9 +301,9 @@ void FolderStorage::emitMsgAddedSignals(int idx) bool FolderStorage::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret) { if (aIndex_ret) *aIndex_ret = -1; - KMFolder *msgParent = aMsg->tqparent(); - // If the message has a tqparent and is in transfer, bail out. If it does not - // have a tqparent we want to be able to add it even if it is in transfer. + KMFolder *msgParent = aMsg->parent(); + // If the message has a parent and is in transfer, bail out. If it does not + // have a parent we want to be able to add it even if it is in transfer. if (aMsg->transferInProgress() && msgParent) return false; if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap) @@ -326,7 +326,7 @@ void FolderStorage::reallyAddMsg(KMMessage* aMsg) return; aMsg->setTransferInProgress( false ); aMsg->setComplete( true ); - KMFolder *aFolder = aMsg->tqparent(); + KMFolder *aFolder = aMsg->parent(); int index; ulong serNum = aMsg->getMsgSerNum(); bool undo = aMsg->enableUndo(); @@ -463,9 +463,9 @@ void FolderStorage::take(TQPtrList<KMMessage> msgList) { for ( KMMessage* msg = msgList.first(); msg; msg = msgList.next() ) { - if (msg->tqparent()) + if (msg->parent()) { - int idx = msg->tqparent()->find(msg); + int idx = msg->parent()->find(msg); if ( idx >= 0 ) take(idx); } @@ -621,7 +621,7 @@ FolderJob* FolderStorage::createJob( TQPtrList<KMMessage>& msgList, const TQStri int FolderStorage::moveMsg(KMMessage* aMsg, int* aIndex_ret) { assert(aMsg != 0); - KMFolder* msgParent = aMsg->tqparent(); + KMFolder* msgParent = aMsg->parent(); if (msgParent) msgParent->open("moveMsgSrc"); @@ -641,7 +641,7 @@ int FolderStorage::moveMsg(TQPtrList<KMMessage> msglist, int* aIndex_ret) { KMMessage* aMsg = msglist.first(); assert(aMsg != 0); - KMFolder* msgParent = aMsg->tqparent(); + KMFolder* msgParent = aMsg->parent(); if (msgParent) msgParent->open("foldermovemsg"); @@ -681,7 +681,7 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent) close("rename", true); oldName = folder()->fileName(); - oldParent = folder()->tqparent(); + oldParent = folder()->parent(); if (newParent) folder()->setParent( newParent ); @@ -723,14 +723,14 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent) } // if the folder is being moved then move its node and, if necessary, also - // the associated subfolder directory node to the new tqparent + // the associated subfolder directory node to the new parent if (newParent) { if (oldParent->findRef( folder() ) != -1) oldParent->take(); newParent->inSort( folder() ); if ( child ) { - if ( child->tqparent()->findRef( child ) != -1 ) - child->tqparent()->take(); + if ( child->parent()->findRef( child ) != -1 ) + child->parent()->take(); newParent->inSort( child ); child->setParent( newParent ); } @@ -898,7 +898,7 @@ void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus, void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx) { if (idx < 0) - idx = aMsg->tqparent()->find( aMsg ); + idx = aMsg->parent()->find( aMsg ); if (idx >= 0 ) { diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index 45a402820..550b45e55 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -84,8 +84,8 @@ class FolderStorage : public TQObject public: - /** Usually a tqparent is given. But in some cases there is no - fitting tqparent object available. Then the name of the folder + /** Usually a parent is given. But in some cases there is no + fitting parent object available. Then the name of the folder is used as the absolute path to the folder file. */ FolderStorage( KMFolder* folder, const char* name=0 ); virtual ~FolderStorage(); diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index 87084b7bb..0363f1fc2 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -39,8 +39,8 @@ using KPIM::MailListDrag; using namespace KMail; -FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * tqparent, const char * name) : - KFolderTree( tqparent, name ), +FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * parent, const char * name) : + KFolderTree( parent, name ), mMainWidget( mainWidget ) { addAcceptableDropMimetype(MailListDrag::format(), false); @@ -212,7 +212,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ fti->setFolderIsCloseToQuota( folder->storage()->isCloseToQuota() ); } - if (fti->tqparent() && !fti->tqparent()->isOpen()) + if (fti->parent() && !fti->parent()->isOpen()) tqrepaint = false; // we're not visible if (tqrepaint) { fti->setNeedsRepaint( true ); diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h index b2c48c705..3a1b21aad 100644 --- a/kmail/foldertreebase.h +++ b/kmail/foldertreebase.h @@ -31,7 +31,7 @@ class FolderTreeBase : public KFolderTree Q_OBJECT TQ_OBJECT public: - FolderTreeBase( KMMainWidget *mainWidget, TQWidget *tqparent = 0, const char *name = 0 ); + FolderTreeBase( KMMainWidget *mainWidget, TQWidget *parent = 0, const char *name = 0 ); /** Returns the main widget that this widget is a child of. */ KMMainWidget* mainWidget() const { return mMainWidget; } diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp index 6e1a2f88c..40b543be7 100644 --- a/kmail/folderutil.cpp +++ b/kmail/folderutil.cpp @@ -41,16 +41,16 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi if (anAccount->makeConnection() == ImapAccountBase::Connected) { newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, parentDir ); if ( newFolder ) { - TQString imapPath, tqparent; + TQString imapPath, parent; if ( !namespaceName.isEmpty() ) { // create folder with namespace - tqparent = anAccount->addPathToNamespace( namespaceName ); - imapPath = anAccount->createImapPath( tqparent, folderName ); + parent = anAccount->addPathToNamespace( namespaceName ); + imapPath = anAccount->createImapPath( parent, folderName ); } else { imapPath = anAccount->createImapPath( selectedStorage->imapPath(), folderName ); } KMFolderImap* newStorage = static_cast<KMFolderImap*>( newFolder->storage() ); - selectedStorage->createFolder(folderName, tqparent); // create it on the server + selectedStorage->createFolder(folderName, parent); // create it on the server newStorage->initializeFrom( selectedStorage, imapPath, TQString() ); static_cast<KMFolderImap*>(parentFolder->storage())->setAccount( selectedStorage->account() ); return newFolder; @@ -82,14 +82,14 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi return newFolder; } -void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent ) +void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent ) { if ( folderToDelete->hasAccounts() ) { // this folder has an account, so we need to change that to the inbox for ( AccountList::Iterator it (folderToDelete->acctList()->begin() ), end( folderToDelete->acctList()->end() ); it != end; ++it ) { (*it)->setFolder( kmkernel->inboxFolder() ); - KMessageBox::information(tqparent, + KMessageBox::information(parent, i18n("<qt>The folder you deleted was associated with the account " "<b>%1</b> which delivered mail into it. The folder the account " "delivers new mail into was reset to the main Inbox folder.</qt>").tqarg( (*it)->name())); diff --git a/kmail/folderutil.h b/kmail/folderutil.h index 255929870..fbb4d0697 100644 --- a/kmail/folderutil.h +++ b/kmail/folderutil.h @@ -35,9 +35,9 @@ namespace FolderUtil /** * Low-level function to create a subfolder for a folder of any kind. * - * @param parentFolder tqparent folder of the folder that should be created. Can be 0 in case of + * @param parentFolder parent folder of the folder that should be created. Can be 0 in case of * local folders - * @param parentDir tqparent folder directory, which should be the folder directory of parentFolder + * @param parentDir parent 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 @@ -53,10 +53,10 @@ KMFolder *createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir, * Handles all types of folders correctly, as well as folders with accounts * * @param folderToDelete the folder which is going to be deleted - * @param tqparent the tqparent widget, which is used when displaying a messagebox, + * @param parent the parent widget, which is used when displaying a messagebox, * which happens when removing a folder with an associated account */ -void deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent ); +void deleteFolder( KMFolder *folderToDelete, TQWidget *parent ); } diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h index 5846cd82d..8e4f56ddd 100644 --- a/kmail/folderviewtooltip.h +++ b/kmail/folderviewtooltip.h @@ -10,9 +10,9 @@ namespace KMail { class FolderViewToolTip : public TQToolTip { public: - FolderViewToolTip( TQListView* tqparent ) : - TQToolTip( tqparent->viewport() ), - mListView( tqparent ) {} + FolderViewToolTip( TQListView* parent ) : + TQToolTip( parent->viewport() ), + mListView( parent ) {} protected: void maybeTip( const TQPoint &point ) diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 7742e3ba6..81a4252cb 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -42,8 +42,8 @@ using namespace KMail; // Constuction a new list view item with the given colors and pixmap -HeaderItem::HeaderItem( TQListView* tqparent, int msgId, const TQString& key ) - : KListViewItem( tqparent ), +HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key ) + : KListViewItem( parent ), mMsgId( msgId ), mKey( key ), mAboutToBeDeleted( false ), @@ -52,9 +52,9 @@ HeaderItem::HeaderItem( TQListView* tqparent, int msgId, const TQString& key ) irefresh(); } -// Constuction a new list view item with the given tqparent, colors, & pixmap -HeaderItem::HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key ) - : KListViewItem( tqparent ), +// Constuction a new list view item with the given parent, colors, & pixmap +HeaderItem::HeaderItem( TQListViewItem* parent, int msgId, const TQString& key ) + : KListViewItem( parent ), mMsgId( msgId ), mKey( key ), mAboutToBeDeleted( false ), @@ -92,7 +92,7 @@ void HeaderItem::irefresh() return; //default to closed // otherwise threadingPolicy == OpenUnread - if (tqparent() && tqparent()->isOpen()) { + if (parent() && parent()->isOpen()) { setOpen(true); return; } @@ -103,8 +103,8 @@ void HeaderItem::irefresh() || mMsgBase->isImportant() || mMsgBase->isTodo() || mMsgBase->isWatched() ) { setOpen(true); HeaderItem * topOfThread = this; - while(topOfThread->tqparent()) - topOfThread = (HeaderItem*)topOfThread->tqparent(); + while(topOfThread->parent()) + topOfThread = (HeaderItem*)topOfThread->parent(); topOfThread->setOpenRecursive(true); } } @@ -198,7 +198,7 @@ TQString HeaderItem::text( int col) const tmp = headers->mDate.dateString( mMsgBase->date() ); } else if(col == headers->paintInfo()->sizeCol && headers->paintInfo()->showSize) { - if ( mMsgBase->tqparent()->folderType() == KMFolderTypeImap ) { + if ( mMsgBase->parent()->folderType() == KMFolderTypeImap ) { tmp = KIO::convertSize( mMsgBase->msgSizeServer() ); } else { tmp = KIO::convertSize( mMsgBase->msgSize() ); @@ -232,17 +232,17 @@ TQPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const } TQPixmap res( width, height ); - TQBitmap tqmask( width, height, true ); + TQBitmap mask( width, height, true ); int x = 0; for ( PixmapList::ConstIterator it = pixmaps.begin(); it != pixmaps.end(); ++it ) { bitBlt( &res, x, (height - (*it).height()) / 2, &(*it) ); - bitBlt( &tqmask, x, (height - (*it).height()) / 2, (*it).tqmask() ); + bitBlt( &mask, x, (height - (*it).height()) / 2, (*it).mask() ); x += (*it).width(); } - res.setMask( tqmask ); + res.setMask( mask ); return res; } @@ -490,7 +490,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers, } else if (column == paintInfo->sizeCol) { TQString len; - if ( msg->tqparent()->folderType() == KMFolderTypeImap ) + if ( msg->parent()->folderType() == KMFolderTypeImap ) { len = TQString::number( msg->msgSizeServer() ); } else { @@ -603,7 +603,7 @@ int HeaderItem::compare( TQListViewItem *i, int col, bool ascending ) const res = key( col, ascending ).compare( i->key( col, ascending ) ); } else if ( col == headers->paintInfo()->dateCol ) { res = key( col, ascending ).compare( i->key( col, ascending ) ); - if (i->tqparent() && !ascending) + if (i->parent() && !ascending) res = -res; } else if ( col == headers->paintInfo()->subCol || col == headers->paintInfo()->senderCol || diff --git a/kmail/headeritem.h b/kmail/headeritem.h index c4a9a9309..2142cf71b 100644 --- a/kmail/headeritem.h +++ b/kmail/headeritem.h @@ -63,14 +63,14 @@ public: mImperfectlyThreaded (true), mSubjThreadingList(0) { } ~SortCacheItem() { if(mUnsortedChildren) free(mUnsortedChildren); } - /** The tqparent node of the item in the threading hierarchy. 0 if the item + /** The parent 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 parents. */ - SortCacheItem *tqparent() const { return mParent; } + SortCacheItem *parent() const { return mParent; } /** * Returs whether the item is so far imperfectly threaded. * If an item is imperfectly threaded (by References or subject, not by * In-Reply-To) it will be reevalutated when a new mail comes in. It could be - * the perfect tqparent. */ + * the perfect parent. */ bool isImperfectlyThreaded() const { return mImperfectlyThreaded; } /** Set whether the item is currently imperfectly threaded (by References @@ -130,7 +130,7 @@ public: void setOffset(int x) { mSortOffset = x; } void updateSortFile( FILE *sortStream, KMFolder *folder, - bool waiting_for_tqparent = false, + bool waiting_for_parent = false, bool update_discovered_count = false); /** Set the list of mails with a certain subject that this item is on. @@ -163,8 +163,8 @@ private: class HeaderItem : public KListViewItem { public: - HeaderItem( TQListView* tqparent, int msgId, const TQString& key = TQString() ); - HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key = TQString() ); + HeaderItem( TQListView* parent, int msgId, const TQString& key = TQString() ); + HeaderItem( TQListViewItem* parent, int msgId, const TQString& key = TQString() ); ~HeaderItem (); /** Set the message id of this item, which is the offset/index in the folder diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index 605e86f81..c576cc461 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -47,11 +47,11 @@ namespace KMail { -HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent, +HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, KListView *listView, KActionCollection *actionCollection, const char *name ) - : KListViewSearchLine(tqparent, listView, name), mStatusCombo(0), mtqStatus(0), statusList() + : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mtqStatus(0), statusList() { KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() @@ -61,14 +61,14 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent, TQT_SLOT( reset() ), actionCollection, "reset_quicksearch" ); - resetQuickSearch->plug( tqparent ); + resetQuickSearch->plug( parent ); resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n" "Resets the quick search so that " "all messages are shown again." ) ); - TQLabel *label = new TQLabel( i18n("Stat&us:"), tqparent, "kde toolbar widget" ); + TQLabel *label = new TQLabel( i18n("Stat&us:"), parent, "kde toolbar widget" ); - mStatusCombo = new TQComboBox( tqparent, "quick search status combo box" ); + mStatusCombo = new TQComboBox( parent, "quick search status combo box" ); mStatusCombo->setSizeLimit( 12 ); mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any tqStatus") ); @@ -89,7 +89,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent, label->setBuddy( mStatusCombo ); - KToolBarButton * btn = new KToolBarButton( "mail_find", 0, tqparent, + KToolBarButton * btn = new KToolBarButton( "mail_find", 0, parent, 0, i18n( "Open Full Search" ) ); connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) ); diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h index df326a0ae..e0589c7d6 100644 --- a/kmail/headerlistquicksearch.h +++ b/kmail/headerlistquicksearch.h @@ -47,7 +47,7 @@ class HeaderListQuickSearch : public KListViewSearchLine Q_OBJECT TQ_OBJECT public: - HeaderListQuickSearch( TQWidget *tqparent, + HeaderListQuickSearch( TQWidget *parent, KListView *listView, KActionCollection *actionCollection, const char *name = 0 ); diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp index 371a48d11..79af65979 100644 --- a/kmail/htmlstatusbar.cpp +++ b/kmail/htmlstatusbar.cpp @@ -48,8 +48,8 @@ #include <tqcolor.h> #include <tqstring.h> -KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * tqparent, const char * name, WFlags f ) - : TQLabel( tqparent, name, f ), +KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlags f ) + : TQLabel( parent, name, f ), mMode( Normal ) { tqsetAlignment( AlignHCenter|AlignTop ); diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h index c23193fa9..20954b82a 100644 --- a/kmail/htmlstatusbar.h +++ b/kmail/htmlstatusbar.h @@ -62,7 +62,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT public: - HtmlStatusBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 ); virtual ~HtmlStatusBar(); enum Mode { diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index ca8fa8dca..ec0559fc0 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -89,9 +89,9 @@ using namespace KPIM; namespace KMail { - IdentityDialog::IdentityDialog( TQWidget * tqparent, const char * name ) + IdentityDialog::IdentityDialog( TQWidget * parent, const char * name ) : KDialogBase( Plain, i18n("Edit Identity"), Ok|Cancel|Help, Ok, - tqparent, name ) + parent, name ) { // tmp. vars: TQWidget * tab; diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h index 82bca1c43..61716983f 100644 --- a/kmail/identitydialog.h +++ b/kmail/identitydialog.h @@ -63,7 +63,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT public: - IdentityDialog( TQWidget * tqparent=0, const char * name = 0 ); + IdentityDialog( TQWidget * parent=0, const char * name = 0 ); virtual ~IdentityDialog(); void setIdentity( /*_not_ const*/ KPIM::Identity & ident ); diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp index 695c8da7b..5ce6f38c8 100644 --- a/kmail/identitylistview.cpp +++ b/kmail/identitylistview.cpp @@ -52,13 +52,13 @@ namespace KMail { // // - IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, const KPIM::Identity & ident ) - : KListViewItem( tqparent ), mUOID( ident.uoid() ) { + IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, const KPIM::Identity & ident ) + : KListViewItem( parent ), mUOID( ident.uoid() ) { init( ident ); } - IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after, const KPIM::Identity & ident ) - : KListViewItem( tqparent, after ), mUOID( ident.uoid() ) { + IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, TQListViewItem * after, const KPIM::Identity & ident ) + : KListViewItem( parent, after ), mUOID( ident.uoid() ) { init( ident ); } @@ -95,8 +95,8 @@ namespace KMail { // // - IdentityListView::IdentityListView( TQWidget * tqparent, const char * name ) - : KListView( tqparent, name ) + IdentityListView::IdentityListView( TQWidget * parent, const char * name ) + : KListView( parent, name ) { setFullWidth( true ); setDragEnabled( true ); diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h index b2c48418e..31b80a77d 100644 --- a/kmail/identitylistview.h +++ b/kmail/identitylistview.h @@ -47,9 +47,9 @@ namespace KMail { **/ class IdentityListViewItem : public KListViewItem { public: - IdentityListViewItem( IdentityListView * tqparent, + IdentityListViewItem( IdentityListView * parent, const KPIM::Identity & ident ); - IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after, + IdentityListViewItem( IdentityListView * parent, TQListViewItem * after, const KPIM::Identity & ident ); uint uoid() const { return mUOID; } @@ -70,7 +70,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT public: - IdentityListView( TQWidget * tqparent=0, const char * name=0 ); + IdentityListView( TQWidget * parent=0, const char * name=0 ); virtual ~IdentityListView() {} public slots: diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index a06163799..977090dd2 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -79,8 +79,8 @@ namespace KMail { // // - ImapAccountBase::ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id ) - : NetworkAccount( tqparent, name, id ), + ImapAccountBase::ImapAccountBase( AccountManager * parent, const TQString & name, uint id ) + : NetworkAccount( parent, name, id ), mIdleTimer( 0, "mIdleTimer" ), mNoopTimer( 0, "mNoopTimer" ), mTotal( 0 ), @@ -412,19 +412,19 @@ namespace KMail { } //----------------------------------------------------------------------------- - // TODO imapPath can be removed once tqparent can be a KMFolderImapBase or whatever - void ImapAccountBase::getUserRights( KMFolder* tqparent, const TQString& imapPath ) + // TODO imapPath can be removed once parent can be a KMFolderImapBase or whatever + void ImapAccountBase::getUserRights( KMFolder* parent, const TQString& imapPath ) { // 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 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 ) - static_cast<KMFolderImap*>( tqparent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok ); - else if ( tqparent->folderType() == KMFolderTypeCachedImap ) - static_cast<KMFolderCachedImap*>( tqparent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok ); - emit receivedUserRights( tqparent ); // warning, you need to connect first to get that one + if ( parent->folderType() == KMFolderTypeImap ) + static_cast<KMFolderImap*>( parent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok ); + else if ( parent->folderType() == KMFolderTypeCachedImap ) + static_cast<KMFolderCachedImap*>( parent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok ); + emit receivedUserRights( parent ); // warning, you need to connect first to get that one return; } @@ -433,7 +433,7 @@ namespace KMail { ACLJobs::GetUserRightsJob* job = ACLJobs::getUserRights( mSlave, url ); - jobData jd( url.url(), tqparent ); + jobData jd( url.url(), parent ); jd.cancellable = true; insertJob(job, jd); @@ -447,7 +447,7 @@ namespace KMail { JobIterator it = findJob( job ); if ( it == jobsEnd() ) return; - KMFolder* folder = (*it).tqparent; + KMFolder* folder = (*it).parent; if ( job->error() ) { if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs mACLSupport = false; @@ -471,13 +471,13 @@ namespace KMail { } //----------------------------------------------------------------------------- - void ImapAccountBase::getACL( KMFolder* tqparent, const TQString& imapPath ) + void ImapAccountBase::getACL( KMFolder* parent, const TQString& imapPath ) { KURL url = getUrl(); url.setPath(imapPath); ACLJobs::GetACLJob* job = ACLJobs::getACL( mSlave, url ); - jobData jd( url.url(), tqparent ); + jobData jd( url.url(), parent ); jd.cancellable = true; insertJob(job, jd); @@ -491,21 +491,21 @@ namespace KMail { JobIterator it = findJob( job ); if ( it == jobsEnd() ) return; - KMFolder* folder = (*it).tqparent; + KMFolder* folder = (*it).parent; emit receivedACL( folder, job, job->entries() ); if (mSlave) removeJob(job); } //----------------------------------------------------------------------------- - // Do not remove imapPath, FolderDiaQuotaTab needs to call this with tqparent==0. - void ImapAccountBase::getStorageQuotaInfo( KMFolder* tqparent, const TQString& imapPath ) + // Do not remove imapPath, FolderDiaQuotaTab needs to call this with parent==0. + void ImapAccountBase::getStorageQuotaInfo( KMFolder* parent, const TQString& imapPath ) { if ( !mSlave ) return; KURL url = getUrl(); url.setPath(imapPath); QuotaJobs::GetStorageQuotaJob* job = QuotaJobs::getStorageQuota( mSlave, url ); - jobData jd( url.url(), tqparent ); + jobData jd( url.url(), parent ); jd.cancellable = true; insertJob(job, jd); @@ -521,7 +521,7 @@ namespace KMail { if ( job->error() && job->error() == KIO::ERR_UNSUPPORTED_ACTION ) setHasNoQuotaSupport(); - KMFolder* folder = (*it).tqparent; // can be 0 + KMFolder* folder = (*it).parent; // can be 0 emit receivedStorageQuotaInfo( folder, job, job->storageQuotaInfo() ); if (mSlave) removeJob(job); } @@ -900,7 +900,7 @@ namespace KMail { TQString quotaAsString( i18n("No detailed quota information available.") ); bool readOnly = false; if (it != mapJobData.end()) { - const KMFolder * const folder = (*it).tqparent; + const KMFolder * const folder = (*it).parent; if( !folder ) return _error; const KMFolderCachedImap * const imap = dynamic_cast<const KMFolderCachedImap*>( folder->storage() ); if ( imap ) { @@ -1109,7 +1109,7 @@ namespace KMail { // more than 50% of the parts have to be loaded anyway so it is faster // to load the message completely kdDebug(5006) << "Falling back to normal mode" << endl; - FolderJob *job = msg->tqparent()->createJob( + FolderJob *job = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, "TEXT" ); job->start(); return; @@ -1123,14 +1123,14 @@ namespace KMail { if ( part->loadHeaders() ) { kdDebug(5006) << "load HEADER" << endl; - FolderJob *job = msg->tqparent()->createJob( + FolderJob *job = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, part->partSpecifier()+".MIME" ); job->start(); } if ( part->loadPart() ) { kdDebug(5006) << "load Part" << endl; - FolderJob *job = msg->tqparent()->createJob( + FolderJob *job = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, part->partSpecifier() ); job->start(); } @@ -1139,7 +1139,7 @@ namespace KMail { //----------------------------------------------------------------------------- void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, - DwBodyPart * tqparent, const DwMessage * dwmsg ) + DwBodyPart * parent, const DwMessage * dwmsg ) { int tqchildren; for (int i = 0; i < count; i++) @@ -1152,12 +1152,12 @@ namespace KMail { << " of type " << part->originalContentTypeStr() << endl; DwBodyPart *dwpart = mCurrentMsg->createDWBodyPart( part ); - if ( tqparent ) + if ( parent ) { - // add to tqparent body - tqparent->Body().AddBodyPart( dwpart ); + // add to parent body + parent->Body().AddBodyPart( dwpart ); dwpart->Parse(); -// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent +// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent // << ",dwparts msg " << dwpart->Body().Message() <<",id "<<dwpart->ObjectId() << endl; } else if ( part->partSpecifier() != "0" && !part->partSpecifier().endsWith(".HEADER") ) @@ -1165,7 +1165,7 @@ namespace KMail { // add to message dwmsg->Body().AddBodyPart( dwpart ); dwpart->Parse(); -// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent +// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent // << ",dwparts msg " << dwpart->Body().Message() <<",id "<<dwpart->ObjectId() << endl; } else dwpart = 0; @@ -1175,20 +1175,20 @@ namespace KMail { if (tqchildren > 0) { - DwBodyPart* newtqparent = dwpart; + DwBodyPart* newparent = dwpart; const DwMessage* newmsg = dwmsg; if ( part->originalContentTypeStr() == "MESSAGE/RFC822" && dwpart && dwpart->Body().Message() ) { // set the encapsulated message as the new message - newtqparent = 0; + newparent = 0; newmsg = dwpart->Body().Message(); } KMMessagePart* newParentKMPart = part; - if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as tqparent + if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent newParentKMPart = parentKMPart; - constructParts( stream, tqchildren, newParentKMPart, newtqparent, newmsg ); + constructParts( stream, tqchildren, newParentKMPart, newparent, newmsg ); } } } @@ -1246,16 +1246,16 @@ namespace KMail { ImapAccountBase::JobIterator it = findJob(job); if ( it == jobsEnd() ) return; int errorCode = job->error(); - KMFolder * const tqparent = (*it).tqparent; + KMFolder * const parent = (*it).parent; const TQString path = (*it).path; if (errorCode && errorCode != KIO::ERR_CANNOT_OPEN_FOR_WRITING) { bool cont = handleJobError( job, i18n( "Error while uploading status of messages to server: " ) + '\n' ); - emit imapStatusChanged( tqparent, path, cont ); + emit imapStatusChanged( parent, path, cont ); } else { - emit imapStatusChanged( tqparent, path, true ); + emit imapStatusChanged( parent, path, true ); removeJob(it); } } @@ -1370,11 +1370,11 @@ namespace KMail { } //------------------------------------------------------------------------------ - TQString ImapAccountBase::createImapPath( const TQString& tqparent, + TQString ImapAccountBase::createImapPath( const TQString& parent, const TQString& folderName ) { - kdDebug(5006) << "createImapPath tqparent="<<tqparent<<", folderName="<<folderName<<endl; - TQString newName = tqparent; + kdDebug(5006) << "createImapPath parent="<<parent<<", folderName="<<folderName<<endl; + TQString newName = parent; // strip / at the end if ( newName.endsWith("/") ) { newName = newName.left( newName.length() - 1 ); @@ -1399,14 +1399,14 @@ namespace KMail { } //------------------------------------------------------------------------------ - TQString ImapAccountBase::createImapPath( FolderStorage* tqparent, + TQString ImapAccountBase::createImapPath( FolderStorage* parent, const TQString& folderName ) { TQString path; - if ( tqparent->folderType() == KMFolderTypeImap ) { - path = static_cast<KMFolderImap*>( tqparent )->imapPath(); - } else if ( tqparent->folderType() == KMFolderTypeCachedImap ) { - path = static_cast<KMFolderCachedImap*>( tqparent )->imapPath(); + if ( parent->folderType() == KMFolderTypeImap ) { + path = static_cast<KMFolderImap*>( parent )->imapPath(); + } else if ( parent->folderType() == KMFolderTypeCachedImap ) { + path = static_cast<KMFolderCachedImap*>( parent )->imapPath(); } else { // error return path; diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index c533171df..533be4839 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -60,7 +60,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT protected: - ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id ); + ImapAccountBase( AccountManager * parent, const TQString & name, uint id ); public: virtual ~ImapAccountBase(); @@ -142,13 +142,13 @@ namespace KMail { struct jobData { // Needed by TQMap, don't use - jobData() : url(TQString()), tqparent(0), current(0), total(1), done(0), offset(0), progressItem(0), + jobData() : url(TQString()), parent(0), current(0), total(1), done(0), offset(0), progressItem(0), onlySubscribed(false), quiet(false), cancellable(false) {} // Real constructor - jobData( const TQString& _url, KMFolder *_tqparent = 0, + jobData( const TQString& _url, KMFolder *_parent = 0, int _total = 1, int _done = 0, bool _quiet = false, bool _cancelable = false ) - : url(_url), tqparent(_tqparent), current(0), total(_total), done(_done), offset(0), + : url(_url), parent(_parent), current(0), total(_total), done(_done), offset(0), progressItem(0), quiet(_quiet), cancellable(_cancelable) {} TQString path; @@ -157,7 +157,7 @@ namespace KMail { TQByteArray data; TQCString cdata; TQStringList items; - KMFolder *tqparent, *current; + KMFolder *parent, *current; TQPtrList<KMMessage> msgList; int total, done, offset; KPIM::ProgressItem *progressItem; @@ -401,16 +401,16 @@ namespace KMail { return mCapabilities.contains( capa ); } /** - * Create an IMAP path for a tqparent folder and a foldername + * Create an IMAP path for a parent folder and a foldername * Parent and folder are separated with the delimiter of the account * The path starts and ends with '/' */ - TQString createImapPath( FolderStorage* tqparent, const TQString& folderName ); + TQString createImapPath( FolderStorage* parent, const TQString& folderName ); /** - * Create an IMAP path for a tqparent imapPath and a folderName + * Create an IMAP path for a parent imapPath and a folderName */ - TQString createImapPath( const TQString& tqparent, const TQString& folderName ); + TQString createImapPath( const TQString& parent, const TQString& folderName ); public slots: @@ -511,7 +511,7 @@ namespace KMail { * Build KMMessageParts and DwBodyParts from the bodystructure-stream */ void constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, - DwBodyPart * tqparent, const DwMessage * dwmsg ); + DwBodyPart * parent, const DwMessage * dwmsg ); /** Migrate the prefix */ void migratePrefix(); diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index c25b29097..3ddb93f39 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -86,11 +86,11 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, if (folder) { folder->open("imapjobdest"); } - KMFolder *msg_tqparent = msg->tqparent(); - if (msg_tqparent) { - msg_tqparent->open("imapjobsrc"); + KMFolder *msg_parent = msg->parent(); + if (msg_parent) { + msg_parent->open("imapjobsrc"); } - mSrcFolder = msg_tqparent; + mSrcFolder = msg_parent; // If there is a destination folder, this is a copy, move or put to an // imap folder, use its account for keeping track of the job. Otherwise, // this is a get job and the src folder is an imap one. Use its account @@ -99,8 +99,8 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, if (folder) { account = folder->account(); } else { - if ( msg_tqparent && msg_tqparent->storage() ) - account = static_cast<KMFolderImap*>(msg_tqparent->storage())->account(); + if ( msg_parent && msg_parent->storage() ) + account = static_cast<KMFolderImap*>(msg_parent->storage())->account(); } if ( !account || account->makeConnection() == ImapAccountBase::Error ) { @@ -125,7 +125,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, TQString flags = KMFolderImap::statusToFlags( curMsg->status(), folder->permanentFlags() ); url.setPath( folder->imapPath() + ";SECTION=" + flags ); ImapAccountBase::jobData jd; - jd.tqparent = 0; jd.offset = 0; jd.done = 0; + jd.parent = 0; jd.offset = 0; jd.done = 0; jd.total = ( curMsg->msgSizeServer() > 0 ) ? curMsg->msgSizeServer() : curMsg->msgSize(); jd.msgList.append( curMsg ); @@ -175,10 +175,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, KURL url = account->getUrl(); KURL destUrl = account->getUrl(); destUrl.setPath(folder->imapPath()); - KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_tqparent->storage()); + KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_parent->storage()); url.setPath( imapDestFolder->imapPath() + ";UID=" + sets ); ImapAccountBase::jobData jd; - jd.tqparent = 0; jd.offset = 0; + jd.parent = 0; jd.offset = 0; jd.total = 1; jd.done = 0; jd.msgList = msgList; @@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, "ImapJobCopyMove"+ProgressManager::getUniqueID(), i18n("Server operation"), i18n("Source folder: %1 - Destination folder: %2") - .tqarg( TQStyleSheet::escape( msg_tqparent->prettyURL() ), + .tqarg( TQStyleSheet::escape( msg_parent->prettyURL() ), TQStyleSheet::escape( mDestFolder->prettyURL() ) ), true, account->useSSL() || account->useTLS() ); @@ -285,7 +285,7 @@ void ImapJob::slotGetNextMessage() KURL url = account->getUrl(); TQString path = msgParent->imapPath() + ";UID=" + TQString::number(msg->UID()); ImapAccountBase::jobData jd; - jd.tqparent = 0; jd.offset = 0; + jd.parent = 0; jd.offset = 0; jd.total = 1; jd.done = 0; jd.msgList.append( msg ); if ( !mPartSpecifier.isEmpty() ) @@ -347,15 +347,15 @@ void ImapJob::slotGetNextMessage() void ImapJob::slotGetMessageResult( KIO::Job * job ) { KMMessage *msg = mMsgList.first(); - if (!msg || !msg->tqparent() || !job) { + if (!msg || !msg->parent() || !job) { emit messageRetrieved( 0 ); deleteLater(); return; } - KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage()); + KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage()); if (msg->transferInProgress()) msg->setTransferInProgress( false ); - KMAcctImap *account = tqparent->account(); + KMAcctImap *account = parent->account(); if ( !account ) { emit messageRetrieved( 0 ); deleteLater(); @@ -397,10 +397,10 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) // During the construction of the message from the byteArray it does // not have a uid. Therefore we have to make sure that no connected // slots are called, since they would operate on uid == 0. - msg->tqparent()->storage()->blockSignals( true ); + msg->parent()->storage()->blockSignals( true ); msg->fromByteArray( (*it).data ); // now let others react - msg->tqparent()->storage()->blockSignals( false ); + msg->parent()->storage()->blockSignals( false ); if ( size > 0 && msg->msgSizeServer() == 0 ) { msg->setMsgSizeServer(size); } @@ -447,9 +447,9 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) /* we got an answer but not data * this means that the msg is not on the server anymore so delete it */ emit messageRetrieved( 0 ); - tqparent->ignoreJobsForMessage( msg ); - int idx = tqparent->find( msg ); - if (idx != -1) tqparent->removeMsg( idx, true ); + parent->ignoreJobsForMessage( msg ); + int idx = parent->find( msg ); + if (idx != -1) parent->removeMsg( idx, true ); // the removeMsg will unGet the message, which will delete all // jobs, including this one return; @@ -464,14 +464,14 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) void ImapJob::slotGetBodyStructureResult( KIO::Job * job ) { KMMessage *msg = mMsgList.first(); - if (!msg || !msg->tqparent() || !job) { + if (!msg || !msg->parent() || !job) { deleteLater(); return; } - KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage()); + KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage()); if (msg->transferInProgress()) msg->setTransferInProgress( false ); - KMAcctImap *account = tqparent->account(); + KMAcctImap *account = parent->account(); if ( !account ) { deleteLater(); return; @@ -678,9 +678,9 @@ void ImapJob::execute() } //----------------------------------------------------------------------------- -void ImapJob::setParentFolder( const KMFolderImap* tqparent ) +void ImapJob::setParentFolder( const KMFolderImap* parent ) { - mParentFolder = const_cast<KMFolderImap*>( tqparent ); + mParentFolder = const_cast<KMFolderImap*>( parent ); } //----------------------------------------------------------------------------- @@ -690,13 +690,13 @@ void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed) if (!msg || !job) { return; } - KMFolderImap* tqparent = 0; - if ( msg->tqparent() && msg->tqparent()->folderType() == KMFolderTypeImap ) - tqparent = static_cast<KMFolderImap*>(msg->tqparent()->storage()); + KMFolderImap* parent = 0; + if ( msg->parent() && msg->parent()->folderType() == KMFolderTypeImap ) + parent = static_cast<KMFolderImap*>(msg->parent()->storage()); else if (mDestFolder) // put - tqparent = static_cast<KMFolderImap*>(mDestFolder->storage()); - if (!tqparent) return; - KMAcctImap *account = tqparent->account(); + parent = static_cast<KMFolderImap*>(mDestFolder->storage()); + if (!parent) return; + KMAcctImap *account = parent->account(); if ( !account ) return; ImapAccountBase::JobIterator it = account->findJob( job ); if ( it == account->jobsEnd() ) return; diff --git a/kmail/imapjob.h b/kmail/imapjob.h index 76174b5f3..04438eb64 100644 --- a/kmail/imapjob.h +++ b/kmail/imapjob.h @@ -64,7 +64,7 @@ public: JobType jt = tGetMessage, KMFolderImap *folder = 0 ); virtual ~ImapJob(); - void setParentFolder( const KMFolderImap* tqparent ); + void setParentFolder( const KMFolderImap* parent ); KPIM::ProgressItem* parentProgressItem() const { return mParentProgressItem; } void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; } diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp index e820f1139..eeea23d78 100644 --- a/kmail/importarchivedialog.cpp +++ b/kmail/importarchivedialog.cpp @@ -32,11 +32,11 @@ using namespace KMail; -ImportArchiveDialog::ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags ) - : KDialogBase( tqparent, "import_archive_dialog", false, i18n( "Import Archive" ), +ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags ) + : KDialogBase( parent, "import_archive_dialog", false, i18n( "Import Archive" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), - mParentWidget( tqparent ) + mParentWidget( parent ) { setWFlags( flags ); TQWidget *mainWidget = new TQWidget( this ); diff --git a/kmail/importarchivedialog.h b/kmail/importarchivedialog.h index f8c15bab4..c5b8a227e 100644 --- a/kmail/importarchivedialog.h +++ b/kmail/importarchivedialog.h @@ -36,7 +36,7 @@ class ImportArchiveDialog : public KDialogBase public: - ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags ); + ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags ); void setFolder( KMFolder *defaultFolder ); protected slots: diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index fc41a46ba..96ea86b5e 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -106,12 +106,12 @@ void KMail::ImportJob::abort( const TQString &errorMessage ) deleteLater(); } -KMFolder * KMail::ImportJob::createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions ) +KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions ) { - KMFolder *newFolder = FolderUtil::createSubFolder( tqparent, tqparent->child(), folderName, TQString(), + KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(), KMFolderTypeMaildir ); if ( !newFolder ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( tqparent->name() ) ); + abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parent->name() ) ); return 0; } else { @@ -131,7 +131,7 @@ void KMail::ImportJob::enqueueMessages( const KArchiveDirectory *dir, KMFolder * const KArchiveDirectory *messageDir = dynamic_cast<const KArchiveDirectory*>( dir->entry( "cur" ) ); if ( messageDir ) { Messages messagesToQueue; - messagesToQueue.tqparent = folder; + messagesToQueue.parent = folder; const TQStringList entries = messageDir->entries(); for ( uint i = 0; i < entries.size(); i++ ) { const KArchiveEntry *entry = messageDir->entry( entries[i] ); @@ -199,7 +199,7 @@ void KMail::ImportJob::importNextMessage() return; } - KMFolder *folder = messages.tqparent; + KMFolder *folder = messages.parent; if ( folder != mCurrentFolder ) { kdDebug(5006) << "importNextMessage(): Processed all messages in the current folder of the queue." << endl; if ( mCurrentFolder ) { @@ -308,7 +308,7 @@ void KMail::ImportJob::importNextDirectory() } Folder folder = mQueuedDirectories.first(); - KMFolder *currentFolder = folder.tqparent; + KMFolder *currentFolder = folder.parent; mQueuedDirectories.pop_front(); kdDebug(5006) << "importNextDirectory(): Working on directory " << folder.archiveDir->name() << endl; @@ -343,7 +343,7 @@ void KMail::ImportJob::importNextDirectory() Folder newFolder; newFolder.archiveDir = dir; - newFolder.tqparent = subFolder; + newFolder.parent = subFolder; kdDebug(5006) << "Enqueueing directory " << entry->name() << endl; mQueuedDirectories.push_back( newFolder ); } @@ -388,7 +388,7 @@ void KMail::ImportJob::start() Folder nextFolder; nextFolder.archiveDir = mArchive->directory(); - nextFolder.tqparent = mRootFolder; + nextFolder.parent = mRootFolder; mQueuedDirectories.push_back( nextFolder ); importNextDirectory(); } diff --git a/kmail/importjob.h b/kmail/importjob.h index d0f4fe488..74d1d9f5b 100644 --- a/kmail/importjob.h +++ b/kmail/importjob.h @@ -72,13 +72,13 @@ class ImportJob : public TQObject struct Folder { - KMFolder *tqparent; + KMFolder *parent; const KArchiveDirectory *archiveDir; }; struct Messages { - KMFolder *tqparent; + KMFolder *parent; TQPtrList<KArchiveFile> files; }; @@ -86,7 +86,7 @@ class ImportJob : public TQObject void abort( const TQString &errorMessage ); void queueFolders(); void importNextDirectory(); - KMFolder* createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions ); + KMFolder* createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions ); KMFolder* getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName, mode_t subFolderPermissions ); void enqueueMessages( const KArchiveDirectory *dir, KMFolder *folder ); @@ -102,11 +102,11 @@ class ImportJob : public TQObject KURL mArchiveFile; int mNumberOfImportedMessages; - // List of archive folders with their corresponding KMail tqparent folder that are awaiting + // List of archive folders with their corresponding KMail parent folder that are awaiting // processing TQValueList<Folder> mQueuedDirectories; - // List of list of messages and their tqparent folders which are awaiting processing + // List of list of messages and their parent folders which are awaiting processing TQValueList<Messages> mQueuedMessages; // The folder to which we are currently importing messages diff --git a/kmail/index.cpp b/kmail/index.cpp index a71d27e9c..5604003d4 100644 --- a/kmail/index.cpp +++ b/kmail/index.cpp @@ -77,8 +77,8 @@ std::vector<TQ_UINT32> TQValueListToVector( const TQValueList<int>& input ) { } #endif -KMMsgIndex::KMMsgIndex( TQObject* tqparent ): - TQObject( tqparent, "index" ), +KMMsgIndex::KMMsgIndex( TQObject* parent ): + TQObject( parent, "index" ), mState( s_idle ), #ifdef HAVE_INDEXLIB mLockFile( std::string( static_cast<const char*>( TQFile::encodeName( defaultPath() ) + "/lock" ) ) ), @@ -152,8 +152,8 @@ KMMsgIndex::~KMMsgIndex() { } bool KMMsgIndex::isIndexable( KMFolder* folder ) const { - if ( !folder || !folder->tqparent() ) return false; - const KMFolderMgr* manager = folder->tqparent()->manager(); + if ( !folder || !folder->parent() ) return false; + const KMFolderMgr* manager = folder->parent()->manager(); return manager == kmkernel->folderMgr() || manager == kmkernel->dimapFolderMgr(); } diff --git a/kmail/index.h b/kmail/index.h index f24dc47b9..bd7749448 100644 --- a/kmail/index.h +++ b/kmail/index.h @@ -53,7 +53,7 @@ class KMMsgIndex : public TQObject { Q_OBJECT TQ_OBJECT public: - explicit KMMsgIndex( TQObject* tqparent ); + explicit KMMsgIndex( TQObject* parent ); ~KMMsgIndex(); public: diff --git a/kmail/interfaces/bodyparturlhandler.h b/kmail/interfaces/bodyparturlhandler.h index 01f64adbe..78d566c1f 100644 --- a/kmail/interfaces/bodyparturlhandler.h +++ b/kmail/interfaces/bodyparturlhandler.h @@ -81,7 +81,7 @@ namespace KMail { /** Called when RMB-clicking on a link in the reader. Should show a context menu at the specified point with the - specified widget as tqparent. + specified widget as parent. @return true if the right-click was handled by this handler, false otherwise. diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h index 702efa415..1eb0e365f 100644 --- a/kmail/interfaces/urlhandler.h +++ b/kmail/interfaces/urlhandler.h @@ -94,7 +94,7 @@ namespace KMail { /** Called when RMB-clicking on a link in the reader. Should show a context menu at the specified point with the specified - widget as tqparent. + widget as parent. @return true if the right-click was handled by this URLHandler, false otherwise. diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp index caf4759f8..d5374fe42 100644 --- a/kmail/jobscheduler.cpp +++ b/kmail/jobscheduler.cpp @@ -34,8 +34,8 @@ using namespace KMail; -JobScheduler::JobScheduler( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ), mTimer( this, "mTimer" ), +JobScheduler::JobScheduler( TQObject* parent, const char* name ) + : TQObject( parent, name ), mTimer( this, "mTimer" ), mPendingImmediateTasks( 0 ), mCurrentTask( 0 ), mCurrentJob( 0 ) { @@ -109,7 +109,7 @@ void JobScheduler::notifyOpeningFolder( KMFolder* folder ) } else { // Jobs scheduled from here should always be cancellable. // One exception though, is when ExpireJob does its final KMMoveCommand. - // Then that command shouldn't kill its own tqparent job just because it opens a folder... + // Then that command shouldn't kill its own parent job just because it opens a folder... if ( mCurrentJob->isCancellable() ) interruptCurrentTask(); } diff --git a/kmail/jobscheduler.h b/kmail/jobscheduler.h index c35121ddd..c0feed34f 100644 --- a/kmail/jobscheduler.h +++ b/kmail/jobscheduler.h @@ -98,7 +98,7 @@ class JobScheduler : public TQObject Q_OBJECT TQ_OBJECT public: - JobScheduler( TQObject* tqparent, const char* name = 0 ); + JobScheduler( TQObject* parent, const char* name = 0 ); ~JobScheduler(); /// Register a task to be done for a given folder diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp index 6cb283746..3ba43637d 100644 --- a/kmail/kcm_kmail.cpp +++ b/kmail/kcm_kmail.cpp @@ -31,55 +31,55 @@ //---------------------------- extern "C" { - KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *parent, const char * ) { - MiscPage *page = new MiscPage( tqparent, "kcmkmail_config_misc" ); + MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" ); return page; } } extern "C" { - KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *parent, const char * ) { AppearancePage *page = - new AppearancePage( tqparent, "kcmkmail_config_appearance" ); + new AppearancePage( parent, "kcmkmail_config_appearance" ); return page; } } extern "C" { - KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *parent, const char * ) { - ComposerPage *page = new ComposerPage( tqparent, "kcmkmail_config_composer" ); + ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" ); return page; } } extern "C" { - KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *parent, const char * ) { - IdentityPage *page = new IdentityPage( tqparent, "kcmkmail_config_identity" ); + IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" ); return page; } } extern "C" { - KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *parent, const char * ) { - AccountsPage *page = new AccountsPage( tqparent, "kcmkmail_config_accounts" ); + AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" ); return page; } } extern "C" { - KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *parent, const char * ) { - SecurityPage *page = new SecurityPage( tqparent, "kcmkmail_config_security" ); + SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" ); return page; } } diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp index 174c2c3a2..2b53e6094 100644 --- a/kmail/khtmlparthtmlwriter.cpp +++ b/kmail/khtmlparthtmlwriter.cpp @@ -47,8 +47,8 @@ namespace KMail { KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( KHTMLPart * part, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), HtmlWriter(), + TQObject * parent, const char * name ) + : TQObject( parent, name ), HtmlWriter(), mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended ) { assert( part ); diff --git a/kmail/khtmlparthtmlwriter.h b/kmail/khtmlparthtmlwriter.h index 3db102f78..7a551584d 100644 --- a/kmail/khtmlparthtmlwriter.h +++ b/kmail/khtmlparthtmlwriter.h @@ -50,7 +50,7 @@ namespace KMail { // Key is Content-Id, value is URL typedef TQMap<TQString, TQString> EmbeddedPartMap; KHtmlPartHtmlWriter( KHTMLPart * part, - TQObject * tqparent=0, const char * name = 0 ); + TQObject * parent=0, const char * name = 0 ); virtual ~KHtmlPartHtmlWriter(); void begin( const TQString & cssDefs ); diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp index 530ffaf45..7027edd6d 100644 --- a/kmail/klistboxdialog.cpp +++ b/kmail/klistboxdialog.cpp @@ -11,10 +11,10 @@ KListBoxDialog::KListBoxDialog( TQString& _selectedString, const TQString& caption, const TQString& labelText, - TQWidget* tqparent, + TQWidget* parent, const char* name, bool modal ) - : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok, true ), + : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ), selectedString( _selectedString ) { diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h index cf155075f..efb73caf7 100644 --- a/kmail/klistboxdialog.h +++ b/kmail/klistboxdialog.h @@ -15,7 +15,7 @@ public: KListBoxDialog( TQString& _selectedString, const TQString& caption, const TQString& labelText, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0, bool modal = true ); ~KListBoxDialog(); diff --git a/kmail/klistviewindexedsearchline.cpp b/kmail/klistviewindexedsearchline.cpp index f556c07dc..9f0e26356 100644 --- a/kmail/klistviewindexedsearchline.cpp +++ b/kmail/klistviewindexedsearchline.cpp @@ -38,8 +38,8 @@ using KMail::HeaderListQuickSearch; -KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* tqparent, KListView* listView, KActionCollection* actionCollection, const char* name ): - HeaderListQuickSearch( tqparent, listView, actionCollection, name ), +KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* parent, KListView* listView, KActionCollection* actionCollection, const char* name ): + HeaderListQuickSearch( parent, listView, actionCollection, name ), mFiltering( false ) { } diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h index f8aaf176a..6cf00bc18 100644 --- a/kmail/klistviewindexedsearchline.h +++ b/kmail/klistviewindexedsearchline.h @@ -53,7 +53,7 @@ class KDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSear public: - explicit KListViewIndexedSearchLine(TQWidget *tqparent, KListView *listView, KActionCollection* action, const char *name = 0); + explicit KListViewIndexedSearchLine(TQWidget *parent, KListView *listView, KActionCollection* action, const char *name = 0); ~KListViewIndexedSearchLine(); public slots: diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 20105acd8..7cadcba97 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -42,8 +42,8 @@ using KMail::FolderJob; #include "kmaccount.moc" //----------------------------------------------------------------------------- -KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent) - : TQObject(tqparent), mPrecommand(precommand) +KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) + : TQObject(parent), mPrecommand(precommand) { BroadcastStatus::instance()->seStatusMsg( i18n("Executing precommand %1").tqarg(precommand )); @@ -220,9 +220,9 @@ bool KMAccount::processNewMsg(KMMessage* aMsg) assert(aMsg != 0); // Save this one for readding - KMFolderCachedImap* tqparent = 0; + KMFolderCachedImap* parent = 0; if( type() == "cachedimap" ) - tqparent = static_cast<KMFolderCachedImap*>( aMsg->storage() ); + parent = static_cast<KMFolderCachedImap*>( aMsg->storage() ); // checks whether we should send delivery receipts // and sends them. @@ -258,7 +258,7 @@ if( fileD0.open( IO_WriteOnly ) ) { else if (processResult == 1) { if( type() == "cachedimap" ) - ; // already done by caller: tqparent->addMsgInternal( aMsg, false ); + ; // already done by caller: parent->addMsgInternal( aMsg, false ); else { // TODO: Perhaps it would be best, if this if was handled by a virtual // method, so the if( !dimap ) above could die? @@ -287,11 +287,11 @@ if( fileD0.open( IO_WriteOnly ) ) { // Count number of new messages for each folder TQString folderId; if ( processResult == 1 ) { - folderId = ( type() == "cachedimap" ) ? tqparent->folder()->idString() + folderId = ( type() == "cachedimap" ) ? parent->folder()->idString() : mFolder->idString(); } else { - folderId = aMsg->tqparent()->idString(); + folderId = aMsg->parent()->idString(); } addToNewInFolder( folderId, 1 ); diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 86e2f6956..43f3aca3a 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -55,7 +55,7 @@ class KMPrecommand : public TQObject TQ_OBJECT public: - KMPrecommand(const TQString &precommand, TQObject *tqparent = 0); + KMPrecommand(const TQString &precommand, TQObject *parent = 0); virtual ~KMPrecommand(); bool start(); diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp index 76339dd65..9066941c6 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/kmail/kmacctcachedimap.cpp @@ -134,8 +134,8 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis TQValueList<KMFolderCachedImap*> folderList; TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin(); for (; it != mapJobData.end(); ++it) { - if ((*it).tqparent) - folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage()); + if ((*it).parent) + folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage()); // Kill the job - except if it's the one that already died and is calling us if ( !it.key()->error() && mSlave ) { it.key()->kill(); @@ -163,8 +163,8 @@ void KMAcctCachedImap::cancelMailCheck() TQValueList<KMFolderCachedImap*> folderList; TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin(); for (; it != mapJobData.end(); ++it) { - if ( (*it).cancellable && (*it).tqparent ) - folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage()); + if ( (*it).cancellable && (*it).parent ) + folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage()); } // Kill jobs ImapAccountBase::cancelMailCheck(); diff --git a/kmail/kmacctfolder.h b/kmail/kmacctfolder.h index 488142a9b..97dca0d75 100644 --- a/kmail/kmacctfolder.h +++ b/kmail/kmacctfolder.h @@ -48,7 +48,7 @@ public: void clearAccountList(); private: - KMAcctFolder( KMFolderDir* tqparent, const TQString& name, + KMAcctFolder( KMFolderDir* parent, const TQString& name, KMFolderType aFolderType ); }; diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index d889b65b2..fe74bc80a 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -153,10 +153,10 @@ void KMAcctImap::killAllJobs( bool disconnectSlave ) msg->setTransferInProgress( false ); } } - if ((*it).tqparent) + if ((*it).parent) { // clear folder state - KMFolderImap *fld = static_cast<KMFolderImap*>((*it).tqparent->storage()); + KMFolderImap *fld = static_cast<KMFolderImap*>((*it).parent->storage()); fld->setCheckingValidity(false); fld->quiet(false); fld->setContentState(KMFolderImap::imapNoInformation); @@ -222,7 +222,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder ) { ImapJob *job = it.current(); ++it; - if ( !job->msgList().isEmpty() && job->msgList().first()->tqparent() == folder ) + if ( !job->msgList().isEmpty() && job->msgList().first()->parent() == folder ) { job->kill(); } @@ -237,8 +237,8 @@ void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder ) while ( it != mapJobData.end() ) { TQMap<KIO::Job*, jobData>::Iterator i = it; it++; - if ( (*i).tqparent ) { - if ( (*i).tqparent == folder ) { + if ( (*i).parent ) { + if ( (*i).parent == folder ) { mapJobData.remove(i); } } @@ -252,8 +252,8 @@ void KMAcctImap::cancelMailCheck() TQValueList<KMFolderImap*> folderList; TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin(); for (; it != mapJobData.end(); ++it) { - if ( (*it).cancellable && (*it).tqparent ) { - folderList << static_cast<KMFolderImap*>((*it).tqparent->storage()); + if ( (*it).cancellable && (*it).parent ) { + folderList << static_cast<KMFolderImap*>((*it).parent->storage()); } } // Kill jobs @@ -607,11 +607,11 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg ) kmkernel->emergencyExit( i18n("Unable to process messages: " ) + TQString::fromLocal8Bit(strerror(errno))); return 2; } - if (msg->tqparent()) { // unGet this msg + if (msg->parent()) { // unGet this msg int idx = -1; KMFolder * p = 0; KMMsgDict::instance()->getLocation( msg, &p, &idx ); - assert( p == msg->tqparent() ); assert( idx >= 0 ); + assert( p == msg->parent() ); assert( idx >= 0 ); p->unGetMsg( idx ); } diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp index caa2a2150..44df37c61 100644 --- a/kmail/kmacctseldlg.cpp +++ b/kmail/kmacctseldlg.cpp @@ -32,8 +32,8 @@ #include "kmacctseldlg.moc" -KMAcctSelDlg::KMAcctSelDlg( TQWidget *tqparent, const char *name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("Add Account"), Ok|Cancel, Ok ) +KMAcctSelDlg::KMAcctSelDlg( TQWidget *parent, const char *name, bool modal ) + : KDialogBase( parent, name, modal, i18n("Add Account"), Ok|Cancel, Ok ) { TQFrame *page = makeMainWidget(); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); diff --git a/kmail/kmacctseldlg.h b/kmail/kmacctseldlg.h index 62a0012b3..1430fe15d 100644 --- a/kmail/kmacctseldlg.h +++ b/kmail/kmacctseldlg.h @@ -33,7 +33,7 @@ class KMAcctSelDlg: public KDialogBase TQ_OBJECT public: - KMAcctSelDlg( TQWidget *tqparent=0, const char *name=0, bool modal=true ); + KMAcctSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true ); /** * Returns selected button from the account selection group: diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index 8054b9d82..11f0ede47 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -97,7 +97,7 @@ </group> <group name="General"> - <entry name="disregardUtqmask" type="Bool"> + <entry name="disregardUmask" type="Bool"> <label>Disregard the users umask setting and use "read-write for the user only" instead</label> <default>false</default> </entry> @@ -257,7 +257,7 @@ </entry> <entry name="TheIMAPResourceFolderParent" type="String"> - <whatsthis><p>This chooses the tqparent of the IMAP resource folders.</p><p>By default, the Kolab server sets the IMAP inbox to be the tqparent.</p></whatsthis> + <whatsthis><p>This chooses the parent of the IMAP resource folders.</p><p>By default, the Kolab server sets the IMAP inbox to be the parent.</p></whatsthis> <default>inbox</default> </entry> diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 63a6df14e..f14a6faa7 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -61,8 +61,8 @@ typedef KParts::GenericFactory< KMailPart > KMailFactory; K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory ) KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList &) : - DCOPObject("KMailIface"), KParts::ReadOnlyPart(tqparent, name), + TQObject *parent, const char *name, const TQStringList &) : + DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name), mParentWidget( parentWidget ) { kdDebug(5006) << "KMailPart()" << endl; @@ -237,8 +237,8 @@ TQWidget* KMailPart::parentWidget() const } -KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *tqparent ) - : KParts::StatusBarExtension( tqparent ), mParent( tqparent ) +KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent ) + : KParts::StatusBarExtension( parent ), mParent( parent ) { } diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index d47041cc2..ff80c19bd 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -55,7 +55,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar TQ_OBJECT public: KMailPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList &); + TQObject *parent, const char *name, const TQStringList &); virtual ~KMailPart(); TQWidget* parentWidget() const; @@ -89,7 +89,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar class KMailStatusBarExtension : public KParts::StatusBarExtension { public: - KMailStatusBarExtension( KMailPart *tqparent ); + KMailStatusBarExtension( KMailPart *parent ); KMainWindow *mainWindow() const; diff --git a/kmail/kmailicalIface.h b/kmail/kmailicalIface.h index cd4ef29c9..bc92d39a4 100644 --- a/kmail/kmailicalIface.h +++ b/kmail/kmailicalIface.h @@ -115,11 +115,11 @@ k_dcop: /** * Trigger the creation of a new resource folder with name @param resource - * under tqparent @param. + * under parent @param. * @return success or failure */ virtual bool addSubresource( const TQString& resource, - const TQString& tqparent, + const TQString& parent, const TQString& contentsType ) = 0; /** * Trigger the deletion of a new resource folder with id @param resource. diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 82084b134..1376932e0 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -611,12 +611,12 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg ) { if( !msg ) return; - KMFolder *tqparent = msg->tqparent(); - Q_ASSERT( tqparent ); + KMFolder *parent = msg->parent(); + Q_ASSERT( parent ); TQ_UINT32 sernum = msg->getMsgSerNum(); // do we have an accumulator for this folder? - Accumulator *ac = mAccumulators.find( tqparent->location() ); + Accumulator *ac = mAccumulators.find( parent->location() ); if( ac ) { TQString s; if ( !vPartFoundAndDecoded( msg, s ) ) return; @@ -634,7 +634,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg ) } else { /* We are not accumulating for this folder, so this one was added * by KMail. Do your thang. */ - slotIncidenceAdded( msg->tqparent(), msg->getMsgSerNum() ); + slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() ); } if ( mTheUnGetMes.contains( sernum ) ) { @@ -687,10 +687,10 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) } // Another special case is our own folders, under the imap INBOX, make // those prettier too - const KMFolder *tqparent = folder; - while ( tqparent->tqparent() && tqparent->tqparent()->owner() ) { - tqparent = tqparent->tqparent()->owner(); - if ( tqparent->isSystemFolder() ) { + const KMFolder *parent = folder; + while ( parent->parent() && parent->parent()->owner() ) { + parent = parent->parent()->owner(); + if ( parent->isSystemFolder() ) { TQStringList remainder(parts); remainder.pop_front(); remainder.pop_front(); @@ -1139,7 +1139,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder, // go get the rest of it, then try again // TODO: Till, port me if ( unget ) mTheUnGetMes.insert( msg->getMsgSerNum(), true ); - FolderJob *job = msg->tqparent()->createJob( msg ); + FolderJob *job = msg->parent()->createJob( msg ); connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) ); job->start(); @@ -1385,8 +1385,8 @@ void KMailICalIfaceImpl::deleteMsg( KMMessage *msg ) { if( !msg ) return; // Commands are now delayed; can't use that anymore, we need immediate deletion - //( new KMDeleteMsgCommand( msg->tqparent(), msg ) )->start(); - KMFolder *srcFolder = msg->tqparent(); + //( new KMDeleteMsgCommand( msg->parent(), msg ) )->start(); + KMFolder *srcFolder = msg->parent(); int idx = srcFolder->find(msg); assert(idx != -1); // kill existing jobs since we are about to delete the message @@ -1704,7 +1704,7 @@ void KMailICalIfaceImpl::readConfig() const bool hideFolders = GlobalSettings::self()->hideGroupwareFolders(); TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent(); - // Find the folder tqparent + // Find the folder parent KMFolderDir* folderParentDir; KMFolderType folderType; KMFolder* folderParent = kmkernel->findFolderById( parentName ); @@ -1738,7 +1738,7 @@ void KMailICalIfaceImpl::readConfig() KMAcctCachedImap::GroupwareType groupwareType = dynamic_cast<KMFolderCachedImap *>( folderParent->storage() )->account()->groupwareType(); if ( groupwareType == KMAcctCachedImap::GroupwareKolab ) { - // Make sure the folder tqparent has the subdirs + // Make sure the folder parent has the subdirs // Globally there are 3 cases: nothing found, some stuff found by type/name heuristics, or everything found OK bool noneFound = true; bool mustFix = false; // true when at least one was found by heuristics @@ -2287,13 +2287,13 @@ bool KMailICalIfaceImpl::isResourceQuiet() const bool KMailICalIfaceImpl::addSubresource( const TQString& resource, - const TQString& tqparent, + const TQString& parent, const TQString& contentsType ) { - kdDebug(5006) << "Adding subresource to tqparent: " << tqparent << " with name: " << resource << endl; + kdDebug(5006) << "Adding subresource to parent: " << parent << " with name: " << resource << endl; kdDebug(5006) << "contents type: " << contentsType << endl; - KMFolder *folder = findResourceFolder( tqparent ); - KMFolderDir *parentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir; + KMFolder *folder = findResourceFolder( parent ); + KMFolderDir *parentFolderDir = !parent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir; if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false; TQString msg; @@ -2359,10 +2359,10 @@ void KMailICalIfaceImpl::syncFolder(KMFolder * folder) const KMFolderCachedImap *dimapFolder = dynamic_cast<KMFolderCachedImap*>( folder->storage() ); if ( !dimapFolder ) return; - // check if the folder exists already, otherwise sync its tqparent as well to create it + // check if the folder exists already, otherwise sync its parent as well to create it if ( dimapFolder->imapPath().isEmpty() ) { - if ( folder->tqparent() && folder->tqparent()->owner() ) - syncFolder( folder->tqparent()->owner() ); + if ( folder->parent() && folder->parent()->owner() ) + syncFolder( folder->parent()->owner() ); else return; } diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h index 3cec23c62..90765ed73 100644 --- a/kmail/kmailicalifaceimpl.h +++ b/kmail/kmailicalifaceimpl.h @@ -136,7 +136,7 @@ public: bool removeSubresource( const TQString& ); bool addSubresource( const TQString& resource, - const TQString& tqparent, + const TQString& parent, const TQString& contentsType ); // tell KOrganizer about messages to be deleted diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp index 7a507c3f1..d1300f840 100644 --- a/kmail/kmatmlistview.cpp +++ b/kmail/kmatmlistview.cpp @@ -9,9 +9,9 @@ #include <tqcheckbox.h> #include <tqheader.h> -KMAtmListViewItem::KMAtmListViewItem( TQListView *tqparent ) +KMAtmListViewItem::KMAtmListViewItem( TQListView *parent ) : TQObject(), - TQListViewItem( tqparent ) + TQListViewItem( parent ) { mCBCompress = new TQCheckBox( listView()->viewport() ); mCBEncrypt = new TQCheckBox( listView()->viewport() ); diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h index 72ae6e25b..f69ea96ae 100644 --- a/kmail/kmatmlistview.h +++ b/kmail/kmatmlistview.h @@ -18,7 +18,7 @@ class KMAtmListViewItem : public TQObject, public TQListViewItem TQ_OBJECT public: - KMAtmListViewItem( TQListView *tqparent ); + KMAtmListViewItem( TQListView *parent ); virtual ~KMAtmListViewItem(); //A custom compare function is needed because the size column is diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index bdd700bf8..5990a4873 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -156,28 +156,28 @@ private: }; -KMCommand::KMCommand( TQWidget *tqparent ) +KMCommand::KMCommand( TQWidget *parent ) : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ), - mEmitsCompletedItself( false ), mParent( tqparent ) + mEmitsCompletedItself( false ), mParent( parent ) { } -KMCommand::KMCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList ) +KMCommand::KMCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList ) : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ), - mEmitsCompletedItself( false ), mParent( tqparent ), mMsgList( msgList ) + mEmitsCompletedItself( false ), mParent( parent ), mMsgList( msgList ) { } -KMCommand::KMCommand( TQWidget *tqparent, KMMsgBase *msgBase ) +KMCommand::KMCommand( TQWidget *parent, KMMsgBase *msgBase ) : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ), - mEmitsCompletedItself( false ), mParent( tqparent ) + mEmitsCompletedItself( false ), mParent( parent ) { mMsgList.append( msgBase ); } -KMCommand::KMCommand( TQWidget *tqparent, KMMessage *msg ) +KMCommand::KMCommand( TQWidget *parent, KMMessage *msg ) : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ), - mEmitsCompletedItself( false ), mParent( tqparent ) + mEmitsCompletedItself( false ), mParent( parent ) { if (msg) mMsgList.append( &msg->toMsgBase() ); @@ -236,7 +236,7 @@ void KMCommand::slotStart() if ((mMsgList.count() == 1) && (mMsgList.getFirst()->isMessage()) && - (mMsgList.getFirst()->tqparent() == 0)) + (mMsgList.getFirst()->parent() == 0)) { // Special case of operating on message that isn't in a folder mRetrievedMsgs.append((KMMessage*)mMsgList.getFirst()); @@ -246,11 +246,11 @@ void KMCommand::slotStart() for ( KMMsgBase *mb = mMsgList.first(); mb; mb = mMsgList.next() ) { if ( mb ) { - if ( !mb->tqparent() ) { + if ( !mb->parent() ) { emit messagesTransfered( Failed ); return; } else { - keepFolderOpen( mb->tqparent() ); + keepFolderOpen( mb->parent() ); } } } @@ -271,7 +271,7 @@ void KMCommand::slotPostTransfer( KMCommand::Result result ) while ( (msg = it.current()) != 0 ) { ++it; - if (msg->tqparent()) + if (msg->parent()) msg->setTransferInProgress(false); } kmkernel->filterMgr()->deref(); @@ -315,27 +315,27 @@ void KMCommand::transferSelectedMsgs() thisMsg = static_cast<KMMessage*>(mb); else { - KMFolder *folder = mb->tqparent(); + KMFolder *folder = mb->parent(); int idx = folder->find(mb); if (idx < 0) continue; thisMsg = folder->getMsg(idx); } if (!thisMsg) continue; if ( thisMsg->transferInProgress() && - thisMsg->tqparent()->folderType() == KMFolderTypeImap ) + thisMsg->parent()->folderType() == KMFolderTypeImap ) { thisMsg->setTransferInProgress( false, true ); - thisMsg->tqparent()->ignoreJobsForMessage( thisMsg ); + thisMsg->parent()->ignoreJobsForMessage( thisMsg ); } - if ( thisMsg->tqparent() && !thisMsg->isComplete() && + if ( thisMsg->parent() && !thisMsg->isComplete() && ( !mProgressDialog || !mProgressDialog->wasCancelled() ) ) { kdDebug(5006)<<"### INCOMPLETE\n"; // the message needs to be transferred first complete = false; KMCommand::mCountJobs++; - FolderJob *job = thisMsg->tqparent()->createJob(thisMsg); + FolderJob *job = thisMsg->parent()->createJob(thisMsg); job->setCancellable( false ); totalSize += thisMsg->msgSizeServer(); // emitted when the message was transferred successfully @@ -436,7 +436,7 @@ void KMCommand::slotTransferCancelled() KMMessage* msg; while ( (msg = it.current()) != 0 ) { - KMFolder *folder = msg->tqparent(); + KMFolder *folder = msg->parent(); ++it; if (!folder) continue; @@ -465,8 +465,8 @@ KMCommand::Result KMMailtoComposeCommand::execute() KMMessage *msg = new KMMessage; uint id = 0; - if ( mMessage && mMessage->tqparent() ) - id = mMessage->tqparent()->identity(); + if ( mMessage && mMessage->parent() ) + id = mMessage->parent()->identity(); msg->initHeader(id); msg->setCharset("utf-8"); @@ -481,9 +481,9 @@ KMCommand::Result KMMailtoComposeCommand::execute() } -KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *tqparent, +KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *parent, const KURL &url, KMMessage *msg, const TQString &selection ) - :KMCommand( tqparent, msg ), mUrl( url ), mSelection( selection ) + :KMCommand( parent, msg ), mUrl( url ), mSelection( selection ) { } @@ -506,9 +506,9 @@ KMCommand::Result KMMailtoReplyCommand::execute() } -KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *tqparent, +KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *parent, const KURL &url, KMMessage *msg ) - :KMCommand( tqparent, msg ), mUrl( url ) + :KMCommand( parent, msg ), mUrl( url ) { } @@ -530,8 +530,8 @@ KMCommand::Result KMMailtoForwardCommand::execute() } -KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent ) - : KMCommand( tqparent ), mUrl( url ) +KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent ) + : KMCommand( parent ), mUrl( url ) { } @@ -550,8 +550,8 @@ KMCommand::Result KMAddBookmarksCommand::execute() } KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url, - TQWidget *tqparent ) - : KMCommand( tqparent ), mUrl( url ) + TQWidget *parent ) + : KMCommand( parent ), mUrl( url ) { } @@ -565,8 +565,8 @@ KMCommand::Result KMMailtoAddAddrBookCommand::execute() KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url, - TQWidget *tqparent ) - : KMCommand( tqparent ), mUrl( url ) + TQWidget *parent ) + : KMCommand( parent ), mUrl( url ) { } @@ -623,8 +623,8 @@ KMCommand::Result KMUrlOpenCommand::execute() } -KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *tqparent ) - : KMCommand( tqparent ), mUrl( url ) +KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *parent ) + : KMCommand( parent ), mUrl( url ) { } @@ -664,45 +664,45 @@ void KMUrlSaveCommand::slotUrlSaveResult( KIO::Job *job ) } -KMEditMsgCommand::KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg ) - :KMCommand( tqparent, msg ) +KMEditMsgCommand::KMEditMsgCommand( TQWidget *parent, KMMessage *msg ) + :KMCommand( parent, msg ) { } KMCommand::Result KMEditMsgCommand::execute() { KMMessage *msg = retrievedMessage(); - if ( !msg || !msg->tqparent() || - ( !kmkernel->folderIsDraftOrOutbox( msg->tqparent() ) && - !kmkernel->folderIsTemplates( msg->tqparent() ) ) ) + if ( !msg || !msg->parent() || + ( !kmkernel->folderIsDraftOrOutbox( msg->parent() ) && + !kmkernel->folderIsTemplates( msg->parent() ) ) ) return Failed; - // Remember the old tqparent, we need it a bit further down to be able + // Remember the old parent, we need it a bit further down to be able // to put the unchanged messsage back in the original folder if the nth // edit is discarded, for n > 1. - KMFolder *tqparent = msg->tqparent(); - if ( tqparent ) - tqparent->take( tqparent->find( msg ) ); + KMFolder *parent = msg->parent(); + if ( parent ) + parent->take( parent->find( msg ) ); KMail::Composer * win = KMail::makeComposer(); msg->setTransferInProgress(false); // From here on on, the composer owns the message. win->setMsg(msg, false, true); - win->setFolder( tqparent ); + win->setFolder( parent ); win->show(); return OK; } -KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg ) - :KMCommand( tqparent, msg ) +KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *parent, KMMessage *msg ) + :KMCommand( parent, msg ) { } KMCommand::Result KMUseTemplateCommand::execute() { KMMessage *msg = retrievedMessage(); - if ( !msg || !msg->tqparent() || - !kmkernel->folderIsTemplates( msg->tqparent() ) ) + if ( !msg || !msg->parent() || + !kmkernel->folderIsTemplates( msg->parent() ) ) return Failed; // Take a copy of the original message, which remains unchanged. @@ -721,9 +721,9 @@ KMCommand::Result KMUseTemplateCommand::execute() return OK; } -KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *tqparent, +KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *parent, KMMessage *msg, bool fixedFont ) - :KMCommand( tqparent, msg ), mFixedFont( fixedFont ) + :KMCommand( parent, msg ), mFixedFont( fixedFont ) { // remember complete state mMsgWasComplete = msg->isComplete(); @@ -782,8 +782,8 @@ static KURL subjectToUrl( const TQString & subject ) return KFileDialog::getSaveURL( cleanSubject, filter ); } -KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg ) - : KMCommand( tqparent ), +KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg ) + : KMCommand( parent ), mMsgListIndex( 0 ), mStandAloneMessage( 0 ), mOffset( 0 ), @@ -797,8 +797,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg ) // from an .eml file. if ( msg->getMsgSerNum() != 0 ) { mMsgList.append( msg->getMsgSerNum() ); - if ( msg->tqparent() ) { - msg->tqparent()->open( "kmsavemsgcommand" ); + if ( msg->parent() ) { + msg->parent()->open( "kmsavemsgcommand" ); } } else { mStandAloneMessage = msg; @@ -806,9 +806,9 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg ) mUrl = subjectToUrl( msg->cleanSubject() ); } -KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, +KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList ) - : KMCommand( tqparent ), + : KMCommand( parent ), mMsgListIndex( 0 ), mStandAloneMessage( 0 ), mOffset( 0 ), @@ -826,8 +826,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, while ( it.current() ) { mMsgList.append( (*it)->getMsgSerNum() ); mTotalSize += (*it)->msgSize(); - if ((*it)->tqparent() != 0) - (*it)->tqparent()->open("kmcommand"); + if ((*it)->parent() != 0) + (*it)->parent()->open("kmcommand"); ++it; } mMsgListIndex = 0; @@ -895,8 +895,8 @@ void KMSaveMsgCommand::slotSaveDataReq() slotMessageRetrievedForSaving( msg ); } else { // retrieve Message first - if ( msg->tqparent() && !msg->isComplete() ) { - FolderJob *job = msg->tqparent()->createJob( msg ); + if ( msg->parent() && !msg->isComplete() ) { + FolderJob *job = msg->parent()->createJob( msg ); job->setCancellable( false ); connect(job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), this, TQT_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) ); @@ -944,12 +944,12 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg) } ++mMsgListIndex; // Get rid of the message. - if ( msg && msg->tqparent() && msg->getMsgSerNum() && + if ( msg && msg->parent() && msg->getMsgSerNum() && mUngetMsgs.contains( msg ) ) { int idx = -1; KMFolder * p = 0; KMMsgDict::instance()->getLocation( msg, &p, &idx ); - assert( p == msg->tqparent() ); assert( idx >= 0 ); + assert( p == msg->parent() ); assert( idx >= 0 ); p->unGetMsg( idx ); p->close("kmcommand"); } @@ -993,9 +993,9 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job) //----------------------------------------------------------------------------- -KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *tqparent, const KURL & url, +KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *parent, const KURL & url, const TQString & encoding ) - : KMCommand( tqparent ), + : KMCommand( parent ), mUrl( url ), mEncoding( encoding ) { @@ -1102,9 +1102,9 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job ) //TODO: ReplyTo, NoQuoteReplyTo, ReplyList, ReplyToAll, ReplyAuthor // are all similar and should be factored -KMReplyToCommand::KMReplyToCommand( TQWidget *tqparent, KMMessage *msg, +KMReplyToCommand::KMReplyToCommand( TQWidget *parent, KMMessage *msg, const TQString &selection ) - : KMCommand( tqparent, msg ), mSelection( selection ) + : KMCommand( parent, msg ), mSelection( selection ) { } @@ -1125,9 +1125,9 @@ KMCommand::Result KMReplyToCommand::execute() } -KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *tqparent, +KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *parent, KMMessage *msg ) - : KMCommand( tqparent, msg ) + : KMCommand( parent, msg ) { } @@ -1148,9 +1148,9 @@ KMCommand::Result KMNoQuoteReplyToCommand::execute() } -KMReplyListCommand::KMReplyListCommand( TQWidget *tqparent, +KMReplyListCommand::KMReplyListCommand( TQWidget *parent, KMMessage *msg, const TQString &selection ) - : KMCommand( tqparent, msg ), mSelection( selection ) + : KMCommand( parent, msg ), mSelection( selection ) { } @@ -1171,9 +1171,9 @@ KMCommand::Result KMReplyListCommand::execute() } -KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *tqparent, +KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *parent, KMMessage *msg, const TQString &selection ) - :KMCommand( tqparent, msg ), mSelection( selection ) + :KMCommand( parent, msg ), mSelection( selection ) { } @@ -1194,9 +1194,9 @@ KMCommand::Result KMReplyToAllCommand::execute() } -KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg, +KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg, const TQString &selection ) - : KMCommand( tqparent, msg ), mSelection( selection ) + : KMCommand( parent, msg ), mSelection( selection ) { } @@ -1217,16 +1217,16 @@ KMCommand::Result KMReplyAuthorCommand::execute() } -KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent, +KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, uint identity ) - : KMCommand( tqparent, msgList ), + : KMCommand( parent, msgList ), mIdentity( identity ) { } -KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent, +KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent, KMMessage *msg, uint identity ) - : KMCommand( tqparent, msg ), + : KMCommand( parent, msg ), mIdentity( identity ) { } @@ -1290,16 +1290,16 @@ KMCommand::Result KMForwardInlineCommand::execute() } -KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent, +KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, uint identity, KMail::Composer *win ) - : KMCommand( tqparent, msgList ), mIdentity( identity ), + : KMCommand( parent, msgList ), mIdentity( identity ), mWin( TQGuardedPtr<KMail::Composer>( win )) { } -KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent, +KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent, KMMessage * msg, uint identity, KMail::Composer *win ) - : KMCommand( tqparent, msg ), mIdentity( identity ), + : KMCommand( parent, msg ), mIdentity( identity ), mWin( TQGuardedPtr< KMail::Composer >( win )) { } @@ -1353,16 +1353,16 @@ KMCommand::Result KMForwardAttachedCommand::execute() } -KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent, +KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, uint identity, KMail::Composer *win ) - : KMCommand( tqparent, msgList ), mIdentity( identity ), + : KMCommand( parent, msgList ), mIdentity( identity ), mWin( TQGuardedPtr<KMail::Composer>( win )) { } -KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent, +KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent, KMMessage * msg, uint identity, KMail::Composer *win ) - : KMCommand( tqparent, msg ), mIdentity( identity ), + : KMCommand( parent, msg ), mIdentity( identity ), mWin( TQGuardedPtr< KMail::Composer >( win )) { } @@ -1440,9 +1440,9 @@ KMCommand::Result KMForwardDigestCommand::execute() return OK; } -KMRedirectCommand::KMRedirectCommand( TQWidget *tqparent, +KMRedirectCommand::KMRedirectCommand( TQWidget *parent, KMMessage *msg ) - : KMCommand( tqparent, msg ) + : KMCommand( parent, msg ) { } @@ -1470,10 +1470,10 @@ KMCommand::Result KMRedirectCommand::execute() } -KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg, +KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg, const TQString &selection, const TQString &tmpl ) - : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl ) + : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl ) { } @@ -1495,10 +1495,10 @@ KMCommand::Result KMCustomReplyToCommand::execute() } -KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg, +KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg, const TQString &selection, const TQString &tmpl ) - : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl ) + : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl ) { } @@ -1520,16 +1520,16 @@ KMCommand::Result KMCustomReplyAllToCommand::execute() } -KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent, +KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, uint identity, const TQString &tmpl ) - : KMCommand( tqparent, msgList ), + : KMCommand( parent, msgList ), mIdentity( identity ), mTemplate( tmpl ) { } -KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent, +KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent, KMMessage *msg, uint identity, const TQString &tmpl ) - : KMCommand( tqparent, msg ), + : KMCommand( parent, msg ), mIdentity( identity ), mTemplate( tmpl ) { } @@ -1593,12 +1593,12 @@ KMCommand::Result KMCustomForwardCommand::execute() } -KMPrintCommand::KMPrintCommand( TQWidget *tqparent, KMMessage *msg, +KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg, const KMail::HeaderStyle *headerStyle, const KMail::HeaderStrategy *headerStrategy, bool htmlOverride, bool htmlLoadExtOverride, bool useFixedFont, const TQString & encoding ) - : KMCommand( tqparent, msg ), + : KMCommand( parent, msg ), mHeaderStyle( headerStyle ), mHeaderStrategy( headerStrategy ), mHtmlOverride( htmlOverride ), mHtmlLoadExtOverride( htmlLoadExtOverride ), @@ -1653,7 +1653,7 @@ KMCommand::Result KMSeStatusCommand::execute() bool parentqStatus = false; // Toggle actions on threads toggle the whole thread - // depending on the state of the tqparent. + // depending on the state of the parent. if (mToggle) { KMMsgBase *msg; KMMsgDict::instance()->getLocation( *mSerNums.begin(), &folder, &idx ); @@ -1712,10 +1712,10 @@ KMCommand::Result KMFilterCommand::execute() } -KMFilterActionCommand::KMFilterActionCommand( TQWidget *tqparent, +KMFilterActionCommand::KMFilterActionCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, KMFilter *filter ) - : KMCommand( tqparent, msgList ), mFilter( filter ) + : KMCommand( parent, msgList ), mFilter( filter ) { TQPtrListIterator<KMMsgBase> it(msgList); while ( it.current() ) { @@ -1821,9 +1821,9 @@ void FolderShortcutCommand::setAction( KAction* action ) mAction = action; } -KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *tqparent, +KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *parent, KMMessage *msg ) - : KMCommand( tqparent, msg ) + : KMCommand( parent, msg ) { } @@ -1984,7 +1984,7 @@ KMCommand::Result KMCopyCommand::execute() for (msgBase = mMsgList.first(); msgBase; msgBase = mMsgList.next() ) { - KMFolder *srcFolder = msgBase->tqparent(); + KMFolder *srcFolder = msgBase->parent(); if (( isMessage = msgBase->isMessage() )) { msg = static_cast<KMMessage*>(msgBase); @@ -2020,7 +2020,7 @@ KMCommand::Result KMCopyCommand::execute() if (srcFolder && !newMsg->isComplete()) { // imap => others - newMsg->setParent(msg->tqparent()); + newMsg->setParent(msg->parent()); FolderJob *job = srcFolder->createJob(newMsg); job->setCancellable( false ); mPendingJobs << job; @@ -2473,19 +2473,19 @@ KMCommand::Result KMUrlClickedCommand::execute() return OK; } -KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg ) - : KMCommand( tqparent, msg ), mImplicitAttachments( true ), mEncoded( false ) +KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg ) + : KMCommand( parent, msg ), mImplicitAttachments( true ), mEncoded( false ) { } -KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase>& msgs ) - : KMCommand( tqparent, msgs ), mImplicitAttachments( true ), mEncoded( false ) +KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList<KMMsgBase>& msgs ) + : KMCommand( parent, msgs ), mImplicitAttachments( true ), mEncoded( false ) { } -KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, TQPtrList<partNode>& attachments, +KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList<partNode>& attachments, KMMessage *msg, bool encoded ) - : KMCommand( tqparent ), mImplicitAttachments( false ), mEncoded( encoded ) + : KMCommand( parent ), mImplicitAttachments( false ), mEncoded( encoded ) { for ( TQPtrListIterator<partNode> it( attachments ); it.current(); ++it ) { mAttachmentMap.insert( it.current(), msg ); @@ -2759,7 +2759,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, } // #79685 by default use the umask the user defined, but let it be configurable - if ( GlobalSettings::self()->disregardUtqmask() ) + if ( GlobalSettings::self()->disregardUmask() ) fchmod( file.handle(), S_IRUSR | S_IWUSR ); ds.setDevice( &file ); @@ -2814,7 +2814,7 @@ void KMLoadPartsCommand::slotStart() !it.key()->msgPart().partSpecifier().isEmpty() ) { // incomplete part, so retrieve it first ++mNeedsRetrieval; - KMFolder* curFolder = it.data()->tqparent(); + KMFolder* curFolder = it.data()->parent(); if ( curFolder ) { FolderJob *job = curFolder->createJob( it.data(), FolderJob::tGetMessage, @@ -2824,7 +2824,7 @@ void KMLoadPartsCommand::slotStart() this, TQT_SLOT(slotPartRetrieved(KMMessage*, TQString)) ); job->start(); } else - kdWarning(5006) << "KMLoadPartsCommand - msg has no tqparent" << endl; + kdWarning(5006) << "KMLoadPartsCommand - msg has no parent" << endl; } } if ( mNeedsRetrieval == 0 ) @@ -2860,9 +2860,9 @@ KMCommand::Result KMLoadPartsCommand::execute() return OK; } -KMResendMessageCommand::KMResendMessageCommand( TQWidget *tqparent, +KMResendMessageCommand::KMResendMessageCommand( TQWidget *parent, KMMessage *msg ) - :KMCommand( tqparent, msg ) + :KMCommand( parent, msg ) { } @@ -2892,8 +2892,8 @@ KMCommand::Result KMResendMessageCommand::execute() return OK; } -KMMailingListCommand::KMMailingListCommand( TQWidget *tqparent, KMFolder *folder ) - : KMCommand( tqparent ), mFolder( folder ) +KMMailingListCommand::KMMailingListCommand( TQWidget *parent, KMFolder *folder ) + : KMCommand( parent ), mFolder( folder ) { } @@ -2931,8 +2931,8 @@ void KMMailingListCommand::commandCompleted( KMCommand *command ) deleteLater(); } -KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder ) - : KMMailingListCommand( tqparent, folder ) +KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *parent, KMFolder *folder ) + : KMMailingListCommand( parent, folder ) { } KURL::List KMMailingListPostCommand::urls() const @@ -2940,8 +2940,8 @@ KURL::List KMMailingListPostCommand::urls() const return mFolder->mailingList().postURLS(); } -KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder ) - : KMMailingListCommand( tqparent, folder ) +KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder ) + : KMMailingListCommand( parent, folder ) { } KURL::List KMMailingListSubscribeCommand::urls() const @@ -2949,8 +2949,8 @@ KURL::List KMMailingListSubscribeCommand::urls() const return mFolder->mailingList().subscribeURLS(); } -KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder ) - : KMMailingListCommand( tqparent, folder ) +KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder ) + : KMMailingListCommand( parent, folder ) { } KURL::List KMMailingListUnsubscribeCommand::urls() const @@ -2958,8 +2958,8 @@ KURL::List KMMailingListUnsubscribeCommand::urls() const return mFolder->mailingList().unsubscribeURLS(); } -KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder ) - : KMMailingListCommand( tqparent, folder ) +KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder ) + : KMMailingListCommand( parent, folder ) { } KURL::List KMMailingListArchivesCommand::urls() const @@ -2967,8 +2967,8 @@ KURL::List KMMailingListArchivesCommand::urls() const return mFolder->mailingList().archiveURLS(); } -KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder ) - : KMMailingListCommand( tqparent, folder ) +KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder ) + : KMMailingListCommand( parent, folder ) { } KURL::List KMMailingListHelpCommand::urls() const @@ -3022,8 +3022,8 @@ KMCommand::Result KMIMChatCommand::execute() KMHandleAttachmentCommand::KMHandleAttachmentCommand( partNode* node, KMMessage* msg, int atmId, const TQString& atmName, - AttachmentAction action, KService::Ptr offer, TQWidget* tqparent ) -: KMCommand( tqparent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ), + AttachmentAction action, KService::Ptr offer, TQWidget* parent ) +: KMCommand( parent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ), mAction( action ), mOffer( offer ), mJob( 0 ) { } @@ -3349,15 +3349,15 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( KIO::Job } -AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) : - KMCommand( tqparent, msg ), +AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * parent) : + KMCommand( parent, msg ), mPartIndex( node->nodeId() ), mSernum( 0 ) { } -AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ) - : KMCommand( tqparent, msg ), +AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent ) + : KMCommand( parent, msg ), mPartIndex( nodeId ), mSernum( 0 ) { @@ -3374,7 +3374,7 @@ KMCommand::Result AttachmentModifyCommand::execute() return Failed; mSernum = msg->getMsgSerNum(); - mFolder = msg->tqparent(); + mFolder = msg->parent(); if ( !mFolder || !mFolder->storage() ) return Failed; @@ -3427,14 +3427,14 @@ void AttachmentModifyCommand::messageDeleteResult(KMCommand * cmd) deleteLater(); } -KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) : - AttachmentModifyCommand( node, msg, tqparent ) +KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) : + AttachmentModifyCommand( node, msg, parent ) { kdDebug(5006) << k_funcinfo << endl; } -KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ) - : AttachmentModifyCommand( nodeId, msg, tqparent ) +KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent ) + : AttachmentModifyCommand( nodeId, msg, parent ) { kdDebug(5006) << k_funcinfo << endl; } @@ -3459,15 +3459,15 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify() } -KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) : - AttachmentModifyCommand( node, msg, tqparent ) +KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) : + AttachmentModifyCommand( node, msg, parent ) { kdDebug(5006) << k_funcinfo << endl; mTempFile.setAutoDelete( true ); } -KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ) - : AttachmentModifyCommand( nodeId, msg, tqparent ) +KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent ) + : AttachmentModifyCommand( nodeId, msg, parent ) { kdDebug(5006) << k_funcinfo << endl; mTempFile.setAutoDelete( true ); @@ -3549,8 +3549,8 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher) } -CreateTodoCommand::CreateTodoCommand(TQWidget * tqparent, KMMessage * msg) - : KMCommand( tqparent, msg ) +CreateTodoCommand::CreateTodoCommand(TQWidget * parent, KMMessage * msg) + : KMCommand( parent, msg ) { } diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 8ebe68b15..4bc86ec05 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -58,13 +58,13 @@ public: enum Result { Undefined, OK, Canceled, Failed }; // Trival constructor, don't retrieve any messages - KMCommand( TQWidget *tqparent = 0 ); + KMCommand( TQWidget *parent = 0 ); // Retrieve all messages in msgList when start is called. - KMCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList ); + KMCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList ); // Retrieve the single message msgBase when start is called. - KMCommand( TQWidget *tqparent, KMMsgBase *msgBase ); + KMCommand( TQWidget *parent, KMMsgBase *msgBase ); // Retrieve the single message msgBase when start is called. - KMCommand( TQWidget *tqparent, KMMessage *message ); + KMCommand( TQWidget *parent, KMMessage *message ); virtual ~KMCommand(); /** These folders will be closed by the dtor, handy, if you need to keep @@ -98,7 +98,7 @@ protected: const TQPtrList<KMMessage> retrievedMsgs() const; // Returns the single message retrieved KMMessage *retrievedMessage() const; - // Returns the tqparent widget + // Returns the parent widget TQWidget *parentWidget() const; bool deletesItself() { return mDeletesItself; } @@ -183,7 +183,7 @@ class KDE_EXPORT KMMailtoReplyCommand : public KMCommand TQ_OBJECT public: - KMMailtoReplyCommand( TQWidget *tqparent, const KURL &url, + KMMailtoReplyCommand( TQWidget *parent, const KURL &url, KMMessage *msg, const TQString &selection ); private: @@ -199,7 +199,7 @@ class KDE_EXPORT KMMailtoForwardCommand : public KMCommand TQ_OBJECT public: - KMMailtoForwardCommand( TQWidget *tqparent, const KURL &url, + KMMailtoForwardCommand( TQWidget *parent, const KURL &url, KMMessage *msg ); private: @@ -214,7 +214,7 @@ class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand TQ_OBJECT public: - KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *tqparent ); + KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *parent ); private: virtual Result execute(); @@ -228,7 +228,7 @@ class KDE_EXPORT KMAddBookmarksCommand : public KMCommand TQ_OBJECT public: - KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent ); + KMAddBookmarksCommand( const KURL &url, TQWidget *parent ); private: virtual Result execute(); @@ -243,7 +243,7 @@ class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand TQ_OBJECT public: - KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *tqparent ); + KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *parent ); private: virtual Result execute(); @@ -287,7 +287,7 @@ class KDE_EXPORT KMUrlSaveCommand : public KMCommand TQ_OBJECT public: - KMUrlSaveCommand( const KURL &url, TQWidget *tqparent ); + KMUrlSaveCommand( const KURL &url, TQWidget *parent ); private slots: void slotUrlSaveResult( KIO::Job *job ); @@ -304,7 +304,7 @@ class KDE_EXPORT KMEditMsgCommand : public KMCommand TQ_OBJECT public: - KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg ); + KMEditMsgCommand( TQWidget *parent, KMMessage *msg ); private: virtual Result execute(); @@ -316,7 +316,7 @@ class KDE_EXPORT KMUseTemplateCommand : public KMCommand TQ_OBJECT public: - KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg ); + KMUseTemplateCommand( TQWidget *parent, KMMessage *msg ); private: virtual Result execute(); @@ -328,7 +328,7 @@ class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand TQ_OBJECT public: - KMShowMsgSrcCommand( TQWidget *tqparent, KMMessage *msg, + KMShowMsgSrcCommand( TQWidget *parent, KMMessage *msg, bool fixedFont ); virtual Result execute(); @@ -343,8 +343,8 @@ class KDE_EXPORT KMSaveMsgCommand : public KMCommand TQ_OBJECT public: - KMSaveMsgCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList ); - KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg ); + KMSaveMsgCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList ); + KMSaveMsgCommand( TQWidget *parent, KMMessage * msg ); KURL url(); private: @@ -375,7 +375,7 @@ class KDE_EXPORT KMOpenMsgCommand : public KMCommand TQ_OBJECT public: - KMOpenMsgCommand( TQWidget *tqparent, const KURL & url = KURL(), + KMOpenMsgCommand( TQWidget *parent, const KURL & url = KURL(), const TQString & encoding = TQString() ); private: @@ -399,24 +399,24 @@ class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand TQ_OBJECT public: /** Use this to save all attachments of the given message. - @param tqparent The tqparent widget of the command used for message boxes. + @param parent The parent widget of the command used for message boxes. @param msg The message of which the attachments should be saved. */ - KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg ); + KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg ); /** Use this to save all attachments of the given messages. - @param tqparent The tqparent widget of the command used for message boxes. + @param parent The parent widget of the command used for message boxes. @param msgs The messages of which the attachments should be saved. */ - KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase>& msgs ); + KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList<KMMsgBase>& msgs ); /** Use this to save the specified attachments of the given message. - @param tqparent The tqparent widget of the command used for message + @param parent The parent widget of the command used for message boxes. @param attachments The attachments that should be saved. @param msg The message that the attachments belong to. @param encoded True if the transport encoding should not be removed when the attachment is saved. */ - KMSaveAttachmentsCommand( TQWidget *tqparent, TQPtrList<partNode> &attachments, + KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList<partNode> &attachments, KMMessage *msg, bool encoded = false ); private slots: @@ -438,7 +438,7 @@ class KDE_EXPORT KMReplyToCommand : public KMCommand TQ_OBJECT public: - KMReplyToCommand( TQWidget *tqparent, KMMessage *msg, + KMReplyToCommand( TQWidget *parent, KMMessage *msg, const TQString &selection = TQString() ); private: @@ -454,7 +454,7 @@ class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand TQ_OBJECT public: - KMNoQuoteReplyToCommand( TQWidget *tqparent, KMMessage *msg ); + KMNoQuoteReplyToCommand( TQWidget *parent, KMMessage *msg ); private: virtual Result execute(); @@ -466,7 +466,7 @@ class KMReplyListCommand : public KMCommand TQ_OBJECT public: - KMReplyListCommand( TQWidget *tqparent, KMMessage *msg, + KMReplyListCommand( TQWidget *parent, KMMessage *msg, const TQString &selection = TQString() ); private: @@ -482,7 +482,7 @@ class KDE_EXPORT KMReplyToAllCommand : public KMCommand TQ_OBJECT public: - KMReplyToAllCommand( TQWidget *tqparent, KMMessage *msg, + KMReplyToAllCommand( TQWidget *parent, KMMessage *msg, const TQString &selection = TQString() ); private: @@ -498,7 +498,7 @@ class KDE_EXPORT KMReplyAuthorCommand : public KMCommand TQ_OBJECT public: - KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg, + KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg, const TQString &selection = TQString() ); private: @@ -514,9 +514,9 @@ class KDE_EXPORT KMForwardInlineCommand : public KMCommand TQ_OBJECT public: - KMForwardInlineCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, + KMForwardInlineCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, uint identity = 0 ); - KMForwardInlineCommand( TQWidget *tqparent, KMMessage * msg, + KMForwardInlineCommand( TQWidget *parent, KMMessage * msg, uint identity = 0 ); private: @@ -532,9 +532,9 @@ class KDE_EXPORT KMForwardAttachedCommand : public KMCommand TQ_OBJECT public: - KMForwardAttachedCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, + KMForwardAttachedCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, uint identity = 0, KMail::Composer *win = 0 ); - KMForwardAttachedCommand( TQWidget *tqparent, KMMessage * msg, + KMForwardAttachedCommand( TQWidget *parent, KMMessage * msg, uint identity = 0, KMail::Composer *win = 0 ); private: @@ -550,9 +550,9 @@ class KDE_EXPORT KMForwardDigestCommand : public KMCommand TQ_OBJECT public: - KMForwardDigestCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, + KMForwardDigestCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, uint identity = 0, KMail::Composer *win = 0 ); - KMForwardDigestCommand( TQWidget *tqparent, KMMessage * msg, + KMForwardDigestCommand( TQWidget *parent, KMMessage * msg, uint identity = 0, KMail::Composer *win = 0 ); private: @@ -568,7 +568,7 @@ class KDE_EXPORT KMRedirectCommand : public KMCommand TQ_OBJECT public: - KMRedirectCommand( TQWidget *tqparent, KMMessage *msg ); + KMRedirectCommand( TQWidget *parent, KMMessage *msg ); private: virtual Result execute(); @@ -580,7 +580,7 @@ class KDE_EXPORT KMCustomReplyToCommand : public KMCommand TQ_OBJECT public: - KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg, + KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg, const TQString &selection, const TQString &tmpl ); @@ -598,7 +598,7 @@ class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand TQ_OBJECT public: - KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg, + KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg, const TQString &selection, const TQString &tmpl ); @@ -616,9 +616,9 @@ class KDE_EXPORT KMCustomForwardCommand : public KMCommand TQ_OBJECT public: - KMCustomForwardCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, + KMCustomForwardCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, uint identity, const TQString &tmpl ); - KMCustomForwardCommand( TQWidget *tqparent, KMMessage * msg, + KMCustomForwardCommand( TQWidget *parent, KMMessage * msg, uint identity, const TQString &tmpl ); private: @@ -634,7 +634,7 @@ class KDE_EXPORT KMPrintCommand : public KMCommand TQ_OBJECT public: - KMPrintCommand( TQWidget *tqparent, KMMessage *msg, + KMPrintCommand( TQWidget *parent, KMMessage *msg, const KMail::HeaderStyle *headerStyle = 0, const KMail::HeaderStrategy *headerStrategy = 0, bool htmlOverride = false, @@ -697,7 +697,7 @@ class KDE_EXPORT KMFilterActionCommand : public KMCommand TQ_OBJECT public: - KMFilterActionCommand( TQWidget *tqparent, + KMFilterActionCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, KMFilter *filter ); @@ -755,7 +755,7 @@ class KDE_EXPORT KMMailingListFilterCommand : public KMCommand TQ_OBJECT public: - KMMailingListFilterCommand( TQWidget *tqparent, KMMessage *msg ); + KMMailingListFilterCommand( TQWidget *parent, KMMessage *msg ); private: virtual Result execute(); @@ -910,7 +910,7 @@ class KDE_EXPORT KMResendMessageCommand : public KMCommand TQ_OBJECT public: - KMResendMessageCommand( TQWidget *tqparent, KMMessage *msg=0 ); + KMResendMessageCommand( TQWidget *parent, KMMessage *msg=0 ); private: virtual Result execute(); @@ -921,7 +921,7 @@ class KDE_EXPORT KMMailingListCommand : public KMCommand Q_OBJECT TQ_OBJECT public: - KMMailingListCommand( TQWidget *tqparent, KMFolder *folder ); + KMMailingListCommand( TQWidget *parent, KMFolder *folder ); private: virtual Result execute(); private slots: @@ -937,7 +937,7 @@ class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand Q_OBJECT TQ_OBJECT public: - KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder ); + KMMailingListPostCommand( TQWidget *parent, KMFolder *folder ); protected: virtual KURL::List urls() const; }; @@ -947,7 +947,7 @@ class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand Q_OBJECT TQ_OBJECT public: - KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder ); + KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder ); protected: virtual KURL::List urls() const; }; @@ -957,7 +957,7 @@ class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand Q_OBJECT TQ_OBJECT public: - KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder ); + KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder ); protected: virtual KURL::List urls() const; }; @@ -967,7 +967,7 @@ class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand Q_OBJECT TQ_OBJECT public: - KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder ); + KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder ); protected: virtual KURL::List urls() const; }; @@ -977,7 +977,7 @@ class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand Q_OBJECT TQ_OBJECT public: - KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder ); + KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder ); protected: virtual KURL::List urls() const; }; @@ -1029,7 +1029,7 @@ public: * @param offer specify a KService that should handle the "open" action, 0 otherwise */ KMHandleAttachmentCommand( partNode* node, KMMessage* msg, int atmId, - const TQString& atmName, AttachmentAction action, KService::Ptr offer, TQWidget* tqparent ); + const TQString& atmName, AttachmentAction action, KService::Ptr offer, TQWidget* parent ); signals: @@ -1095,8 +1095,8 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand Q_OBJECT TQ_OBJECT public: - AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *tqparent ); - AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ); + AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *parent ); + AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent ); ~AttachmentModifyCommand(); protected: @@ -1123,8 +1123,8 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand Q_OBJECT TQ_OBJECT public: - KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *tqparent ); - KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ); + KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent ); + KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent ); ~KMDeleteAttachmentCommand(); protected: @@ -1137,8 +1137,8 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand Q_OBJECT TQ_OBJECT public: - KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *tqparent ); - KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ); + KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent ); + KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent ); ~KMEditAttachmentCommand(); protected: @@ -1156,7 +1156,7 @@ class KDE_EXPORT CreateTodoCommand : public KMCommand Q_OBJECT TQ_OBJECT public: - CreateTodoCommand( TQWidget *tqparent, KMMessage *msg ); + CreateTodoCommand( TQWidget *parent, KMMessage *msg ); private: Result execute(); diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 45daa0c36..2e0906396 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -971,7 +971,7 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width) void KMComposeWin::rethinkFields(bool fromSlot) { //This sucks even more but again no ids. sorry (sven) - int tqmask, row, numRows; + int mask, row, numRows; long showHeaders; if (mShowHeaders < 0) @@ -979,8 +979,8 @@ void KMComposeWin::rethinkFields(bool fromSlot) else showHeaders = mShowHeaders; - for (tqmask=1,mNumHeaders=0; tqmask<=showHeaders; tqmask<<=1) - if ((showHeaders&tqmask) != 0) mNumHeaders++; + for (mask=1,mNumHeaders=0; mask<=showHeaders; mask<<=1) + if ((showHeaders&mask) != 0) mNumHeaders++; numRows = mNumHeaders + 1; @@ -4091,7 +4091,7 @@ void KMComposeWin::slotContinuePrint( bool rc ) } //---------------------------------------------------------------------------- -bool KMComposeWin::validateAddresses( TQWidget * tqparent, const TQString & addresses ) +bool KMComposeWin::validateAddresses( TQWidget * parent, const TQString & addresses ) { TQString brokenAddress; KPIM::EmailParseResult errorCode = KMMessage::isValidEmailAddressList( KMMessage::expandAliases( addresses ), brokenAddress ); @@ -4099,7 +4099,7 @@ bool KMComposeWin::validateAddresses( TQWidget * tqparent, const TQString & addr TQString errorMsg( "<qt><p><b>" + brokenAddress + "</b></p><p>" + KPIM::emailParseResultToString( errorCode ) + "</p></qt>" ); - KMessageBox::sorry( tqparent, errorMsg, i18n("Invalid Email Address") ); + KMessageBox::sorry( parent, errorMsg, i18n("Invalid Email Address") ); return false; } return true; diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 874789b2d..bd15cbbdd 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -556,7 +556,7 @@ private: const TQString &toolTip = TQString(), const TQString &whatsThis = TQString() ); - void rethinkHeaderLine( int value, int tqmask, int& row, + void rethinkHeaderLine( int value, int mask, int& row, TQLabel* lbl, TQComboBox* cbx, TQCheckBox *chk ); /** @@ -716,7 +716,7 @@ private: * @return true if all addresses are valid. * @return false if one or several addresses are invalid. */ - static bool validateAddresses( TQWidget * tqparent, const TQString & addresses ); + static bool validateAddresses( TQWidget * parent, const TQString & addresses ); /** * Sets the transport combobox to @p transport. If @p transport is empty diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 336901b37..c77250c53 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -209,10 +209,10 @@ void KMEdit::contentsDropEvent(TQDropEvent *e) } } -KMEdit::KMEdit(TQWidget *tqparent, KMComposeWin* composer, +KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer, KSpellConfig* autoSpellConfig, const char *name) - : KEdit( tqparent, name ), + : KEdit( parent, name ), mComposer( composer ), mKSpellForDialog( 0 ), mSpeller( 0 ), diff --git a/kmail/kmedit.h b/kmail/kmedit.h index 08ed687d4..a27a44804 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -67,7 +67,7 @@ class KMEdit : public KEdit { Q_OBJECT TQ_OBJECT public: - KMEdit(TQWidget *tqparent=0,KMComposeWin* composer=0, + KMEdit(TQWidget *parent=0,KMComposeWin* composer=0, KSpellConfig* spellConfig = 0, const char *name=0); ~KMEdit(); diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index c495ffbbd..a4efae487 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -25,8 +25,8 @@ // //============================================================================= -KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { TQHBoxLayout *hbl = new TQHBoxLayout(this); hbl->setSpacing(4); @@ -69,8 +69,8 @@ void KMFilterActionWithAddressWidget::slotAddrBook() mLineEdit->setText( txt + addrList.join(",") ); } -KMSoundTestWidget::KMSoundTestWidget(TQWidget *tqparent, const char *name) - : TQWidget( tqparent, name) +KMSoundTestWidget::KMSoundTestWidget(TQWidget *parent, const char *name) + : TQWidget( parent, name) { TQHBoxLayout *lay1 = new TQHBoxLayout( this ); m_playButton = new TQPushButton( this, "m_playButton" ); diff --git a/kmail/kmfawidgets.h b/kmail/kmfawidgets.h index c0605874f..2528f2ba5 100644 --- a/kmail/kmfawidgets.h +++ b/kmail/kmfawidgets.h @@ -20,7 +20,7 @@ class KMFilterActionWithAddressWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KMFilterActionWithAddressWidget( TQWidget* tqparent=0, const char* name=0 ); + KMFilterActionWithAddressWidget( TQWidget* parent=0, const char* name=0 ); void clear() { mLineEdit->clear(); } TQString text() const { return mLineEdit->text(); } @@ -43,7 +43,7 @@ class KMSoundTestWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KMSoundTestWidget( TQWidget * tqparent, const char * name=0 ); + KMSoundTestWidget( TQWidget * parent, const char * name=0 ); ~KMSoundTestWidget(); TQString url() const; void setUrl( const TQString & url ); diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 49378e9d5..d10a509b5 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -88,9 +88,9 @@ KMFilterAction* KMFilterAction::newAction() return 0; } -TQWidget* KMFilterAction::createParamWidget(TQWidget* tqparent) const +TQWidget* KMFilterAction::createParamWidget(TQWidget* parent) const { - return new TQWidget(tqparent); + return new TQWidget(parent); } void KMFilterAction::applyParamWidgetValue(TQWidget*) @@ -201,9 +201,9 @@ KMFilterActionWithString::KMFilterActionWithString( const char* aName, const TQS { } -TQWidget* KMFilterActionWithString::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionWithString::createParamWidget( TQWidget* parent ) const { - TQLineEdit *le = new KLineEdit(tqparent); + TQLineEdit *le = new KLineEdit(parent); le->setText( mParameter ); return le; } @@ -251,9 +251,9 @@ KMFilterActionWithStringList::KMFilterActionWithStringList( const char* aName, c { } -TQWidget* KMFilterActionWithStringList::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionWithStringList::createParamWidget( TQWidget* parent ) const { - TQComboBox *cb = new TQComboBox( false, tqparent ); + TQComboBox *cb = new TQComboBox( false, parent ); cb->insertStringList( mParameterList ); setParamWidgetValue( cb ); return cb; @@ -298,9 +298,9 @@ KMFilterActionWithFolder::KMFilterActionWithFolder( const char* aName, const TQS mFolder = 0; } -TQWidget* KMFilterActionWithFolder::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionWithFolder::createParamWidget( TQWidget* parent ) const { - FolderRequester *req = new FolderRequester( tqparent, + FolderRequester *req = new FolderRequester( parent, kmkernel->getKMMainWidget()->folderTree() ); setParamWidgetValue( req ); return req; @@ -380,9 +380,9 @@ KMFilterActionWithAddress::KMFilterActionWithAddress( const char* aName, const T { } -TQWidget* KMFilterActionWithAddress::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionWithAddress::createParamWidget( TQWidget* parent ) const { - KMFilterActionWithAddressWidget *w = new KMFilterActionWithAddressWidget(tqparent); + KMFilterActionWithAddressWidget *w = new KMFilterActionWithAddressWidget(parent); w->setText( mParameter ); return w; } @@ -413,9 +413,9 @@ KMFilterActionWithCommand::KMFilterActionWithCommand( const char* aName, const T { } -TQWidget* KMFilterActionWithCommand::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionWithCommand::createParamWidget( TQWidget* parent ) const { - return KMFilterActionWithUrl::createParamWidget( tqparent ); + return KMFilterActionWithUrl::createParamWidget( parent ); } void KMFilterActionWithCommand::applyParamWidgetValue( TQWidget* paramWidget ) @@ -689,9 +689,9 @@ public: virtual ReturnCode process(KMMessage* msg) const; static KMFilterAction* newAction(); - TQWidget * createParamWidget( TQWidget * tqparent ) const; - void applyParamWidgetValue( TQWidget * tqparent ); - void setParamWidgetValue( TQWidget * tqparent ) const; + TQWidget * createParamWidget( TQWidget * parent ) const; + void applyParamWidgetValue( TQWidget * parent ); + void setParamWidgetValue( TQWidget * parent ) const; void clearParamWidget( TQWidget * param ) const; }; @@ -712,9 +712,9 @@ KMFilterAction::ReturnCode KMFilterActionIdentity::process(KMMessage* msg) const return GoOn; } -TQWidget * KMFilterActionIdentity::createParamWidget( TQWidget * tqparent ) const +TQWidget * KMFilterActionIdentity::createParamWidget( TQWidget * parent ) const { - KPIM::IdentityCombo * ic = new KPIM::IdentityCombo( kmkernel->identityManager(), tqparent ); + KPIM::IdentityCombo * ic = new KPIM::IdentityCombo( kmkernel->identityManager(), parent ); ic->setCurrentIdentity( mParameter ); return ic; } @@ -951,7 +951,7 @@ class KMFilterActionRemoveHeader: public KMFilterActionWithStringList public: KMFilterActionRemoveHeader(); virtual ReturnCode process(KMMessage* msg) const; - virtual TQWidget* createParamWidget( TQWidget* tqparent ) const; + virtual TQWidget* createParamWidget( TQWidget* parent ) const; virtual void setParamWidgetValue( TQWidget* paramWidget ) const; static KMFilterAction* newAction(); @@ -974,9 +974,9 @@ KMFilterActionRemoveHeader::KMFilterActionRemoveHeader() mParameter = *mParameterList.at(0); } -TQWidget* KMFilterActionRemoveHeader::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionRemoveHeader::createParamWidget( TQWidget* parent ) const { - TQComboBox *cb = new TQComboBox( true/*editable*/, tqparent ); + TQComboBox *cb = new TQComboBox( true/*editable*/, parent ); cb->setInsertionPolicy( TQComboBox::AtBottom ); setParamWidgetValue( cb ); return cb; @@ -1017,7 +1017,7 @@ class KMFilterActionAddHeader: public KMFilterActionWithStringList public: KMFilterActionAddHeader(); virtual ReturnCode process(KMMessage* msg) const; - virtual TQWidget* createParamWidget( TQWidget* tqparent ) const; + virtual TQWidget* createParamWidget( TQWidget* parent ) const; virtual void setParamWidgetValue( TQWidget* paramWidget ) const; virtual void applyParamWidgetValue( TQWidget* paramWidget ); virtual void clearParamWidget( TQWidget* paramWidget ) const; @@ -1055,9 +1055,9 @@ KMFilterAction::ReturnCode KMFilterActionAddHeader::process(KMMessage* msg) cons return GoOn; } -TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* parent ) const { - TQWidget *w = new TQWidget( tqparent ); + TQWidget *w = new TQWidget( parent ); TQHBoxLayout *hbl = new TQHBoxLayout( w ); hbl->setSpacing( 4 ); TQComboBox *cb = new TQComboBox( true, w, "combo" ); @@ -1157,7 +1157,7 @@ class KMFilterActionRewriteHeader: public KMFilterActionWithStringList public: KMFilterActionRewriteHeader(); virtual ReturnCode process(KMMessage* msg) const; - virtual TQWidget* createParamWidget( TQWidget* tqparent ) const; + virtual TQWidget* createParamWidget( TQWidget* parent ) const; virtual void setParamWidgetValue( TQWidget* paramWidget ) const; virtual void applyParamWidgetValue( TQWidget* paramWidget ); virtual void clearParamWidget( TQWidget* paramWidget ) const; @@ -1203,9 +1203,9 @@ KMFilterAction::ReturnCode KMFilterActionRewriteHeader::process(KMMessage* msg) return GoOn; } -TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* parent ) const { - TQWidget *w = new TQWidget( tqparent ); + TQWidget *w = new TQWidget( parent ); TQHBoxLayout *hbl = new TQHBoxLayout( w ); hbl->setSpacing( 4 ); @@ -1366,7 +1366,7 @@ KMFilterAction::ReturnCode KMFilterActionMove::process(KMMessage* msg) const bool KMFilterActionMove::requiresBody(KMMsgBase*) const { - return false; //iff mFolder->folderMgr == msgBase->tqparent()->folderMgr; + return false; //iff mFolder->folderMgr == msgBase->parent()->folderMgr; } @@ -1443,7 +1443,7 @@ class KMFilterActionForward: public KMFilterActionWithAddress public: KMFilterActionForward(); virtual ReturnCode process( KMMessage* msg ) const; - virtual TQWidget* createParamWidget( TQWidget* tqparent ) const; + virtual TQWidget* createParamWidget( TQWidget* parent ) const; virtual void applyParamWidgetValue( TQWidget* paramWidget ); virtual void setParamWidgetValue( TQWidget* paramWidget ) const; virtual void clearParamWidget( TQWidget* paramWidget ) const; @@ -1495,9 +1495,9 @@ KMFilterAction::ReturnCode KMFilterActionForward::process(KMMessage* aMsg) const return GoOn; } -TQWidget* KMFilterActionForward::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionForward::createParamWidget( TQWidget* parent ) const { - TQWidget *addressAndTemplate = new TQWidget( tqparent ); + TQWidget *addressAndTemplate = new TQWidget( parent ); TQHBoxLayout *hBox = new TQHBoxLayout( addressAndTemplate ); TQWidget *addressEdit = KMFilterActionWithAddress::createParamWidget( addressAndTemplate ); addressEdit->setName( "addressEdit" ); @@ -1699,8 +1699,8 @@ KMFilterAction::ReturnCode KMFilterActionExec::process(KMMessage *aMsg) const class PipeJob : public KPIM::ThreadWeaver::Job { public: - PipeJob(TQObject* tqparent = 0 , const char* name = 0, KMMessage* aMsg = 0, TQString cmd = 0, TQString tempFileName = 0 ) - : Job (tqparent, name), + PipeJob(TQObject* parent = 0 , const char* name = 0, KMMessage* aMsg = 0, TQString cmd = 0, TQString tempFileName = 0 ) + : Job (parent, name), mTempFileName(tempFileName), mCmd(cmd), mMsg( aMsg ) @@ -1737,7 +1737,7 @@ class PipeJob : public KPIM::ThreadWeaver::Job pclose(p); if ( !ba.isEmpty() ) { KPIM::ThreadWeaver::debug (1, "PipeJob::run: %s", TQString(ba).latin1() ); - KMFolder *filterFolder = mMsg->tqparent(); + KMFolder *filterFolder = mMsg->parent(); ActionScheduler *handler = MessageProperty::filterHandler( mMsg->getMsgSerNum() ); mMsg->fromByteArray( ba ); @@ -1842,9 +1842,9 @@ KMFilterActionWithTest::~KMFilterActionWithTest() { } -TQWidget* KMFilterActionWithTest::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionWithTest::createParamWidget( TQWidget* parent ) const { - KMSoundTestWidget *le = new KMSoundTestWidget(tqparent); + KMSoundTestWidget *le = new KMSoundTestWidget(parent); le->setUrl( mParameter ); return le; } @@ -1919,9 +1919,9 @@ KMFilterActionWithUrl::~KMFilterActionWithUrl() { } -TQWidget* KMFilterActionWithUrl::createParamWidget( TQWidget* tqparent ) const +TQWidget* KMFilterActionWithUrl::createParamWidget( TQWidget* parent ) const { - KURLRequester *le = new KURLRequester(tqparent); + KURLRequester *le = new KURLRequester(parent); le->setURL( mParameter ); return le; } diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h index 21fa0e73b..451c9b5b6 100644 --- a/kmail/kmfilteraction.h +++ b/kmail/kmfilteraction.h @@ -111,7 +111,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* tqparent) const; + virtual TQWidget* createParamWidget(TQWidget* parent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -234,7 +234,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* tqparent) const; + virtual TQWidget* createParamWidget(TQWidget* parent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -345,7 +345,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* tqparent) const; + virtual TQWidget* createParamWidget(TQWidget* parent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -404,7 +404,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* tqparent) const; + virtual TQWidget* createParamWidget(TQWidget* parent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -469,7 +469,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* tqparent) const; + virtual TQWidget* createParamWidget(TQWidget* parent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -526,7 +526,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* tqparent) const; + virtual TQWidget* createParamWidget(TQWidget* parent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -565,7 +565,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* tqparent) const; + virtual TQWidget* createParamWidget(TQWidget* parent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -607,7 +607,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* tqparent) const; + virtual TQWidget* createParamWidget(TQWidget* parent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index 02abff7bf..c730375e4 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -128,10 +128,10 @@ const char * KMPopFilterDlgHelpAnchor = "popfilters-id" ; // //============================================================================= -KMFilterDlg::KMFilterDlg(TQWidget* tqparent, const char* name, bool popFilter, bool createDummyFilter ) - : KDialogBase( tqparent, name, false /* modality */, +KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, bool createDummyFilter ) + : KDialogBase( parent, name, false /* modality */, (popFilter)? i18n("POP3 Filter Rules"): i18n("Filter Rules") /* caption*/, - Help|Ok|Apply|Cancel|User1|User2 /* button tqmask */, + Help|Ok|Apply|Cancel|User1|User2 /* button mask */, Ok /* default btn */, false /* separator */), bPopFilter(popFilter) { @@ -577,8 +577,8 @@ void KMFilterDlg::slotUpdateAccountList() // //============================================================================= -KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *tqparent, const char* name, bool popFilter ) - : TQGroupBox( 1, Qt::Horizontal, title, tqparent, name ), +KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, const char* name, bool popFilter ) + : TQGroupBox( 1, Qt::Horizontal, title, parent, name ), bPopFilter(popFilter) { mFilterList.setAutoDelete( true ); @@ -1108,8 +1108,8 @@ void KMFilterListBox::swapFilters( int from, int to ) // //============================================================================= -KMFilterActionWidget::KMFilterActionWidget( TQWidget *tqparent, const char* name ) - : TQHBox( tqparent, name ) +KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name ) + : TQHBox( parent, name ) { int i; mActionList.setAutoDelete( true ); @@ -1209,8 +1209,8 @@ KMFilterAction * KMFilterActionWidget::action() // //============================================================================= -KMFilterActionWidgetLister::KMFilterActionWidgetLister( TQWidget *tqparent, const char* name ) - : KWidgetLister( 1, FILTER_MAX_ACTIONS, tqparent, name ) +KMFilterActionWidgetLister::KMFilterActionWidgetLister( TQWidget *parent, const char* name ) + : KWidgetLister( 1, FILTER_MAX_ACTIONS, parent, name ) { mActionList = 0; } @@ -1228,7 +1228,7 @@ void KMFilterActionWidgetLister::setActionList( TQPtrList<KMFilterAction> *aList mActionList = aList; - ((TQWidget*)tqparent())->setEnabled( true ); + ((TQWidget*)parent())->setEnabled( true ); if ( aList->count() == 0 ) { slotClear(); @@ -1262,12 +1262,12 @@ void KMFilterActionWidgetLister::reset() mActionList = 0; slotClear(); - ((TQWidget*)tqparent())->setEnabled( false ); + ((TQWidget*)parent())->setEnabled( false ); } -TQWidget* KMFilterActionWidgetLister::createWidget( TQWidget *tqparent ) +TQWidget* KMFilterActionWidgetLister::createWidget( TQWidget *parent ) { - return new KMFilterActionWidget(tqparent); + return new KMFilterActionWidget(parent); } void KMFilterActionWidgetLister::clearWidget( TQWidget *aWidget ) @@ -1297,8 +1297,8 @@ void KMFilterActionWidgetLister::regenerateActionListFromWidgets() // //============================================================================= -KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidget *tqparent, const char* name ) - : TQVButtonGroup( title, tqparent, name ) +KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidget *parent, const char* name ) + : TQVButtonGroup( title, parent, name ) { mActionMap[Down] = new TQRadioButton( i18n("&Download mail"), this ); mActionMap[Later] = new TQRadioButton( i18n("Download mail la&ter"), this ); diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h index a664fad9c..ed72d991b 100644 --- a/kmail/kmfilterdlg.h +++ b/kmail/kmfilterdlg.h @@ -63,7 +63,7 @@ class KMFilterListBox : public TQGroupBox TQ_OBJECT public: /** Constuctor. */ - KMFilterListBox( const TQString & title, TQWidget* tqparent=0, const char* name=0, bool popFilter = false); + KMFilterListBox( const TQString & title, TQWidget* parent=0, const char* name=0, bool popFilter = false); /** Called from KMFilterDlg. Creates a new filter and presets the first rule with "field equals value". It's there mainly to @@ -200,7 +200,7 @@ class KMFilterActionWidget : public TQHBox public: /** Constructor. Creates a filter action widget with no type selected. */ - KMFilterActionWidget( TQWidget* tqparent=0, const char* name=0 ); + KMFilterActionWidget( TQWidget* parent=0, const char* name=0 ); /** Set an action. The action's type is determined and the corresponding widget it loaded with @p aAction's parameters and @@ -232,7 +232,7 @@ class KMPopFilterActionWidget : public TQVButtonGroup Q_OBJECT TQ_OBJECT public: - KMPopFilterActionWidget( const TQString &title, TQWidget* tqparent=0, const char* name=0 ); + KMPopFilterActionWidget( const TQString &title, TQWidget* parent=0, const char* name=0 ); void setAction( KMPopFilterAction aAction ); KMPopFilterAction action(); @@ -257,7 +257,7 @@ class KMFilterActionWidgetLister : public KWidgetLister Q_OBJECT TQ_OBJECT public: - KMFilterActionWidgetLister( TQWidget *tqparent=0, const char* name=0 ); + KMFilterActionWidgetLister( TQWidget *parent=0, const char* name=0 ); virtual ~KMFilterActionWidgetLister(); @@ -271,7 +271,7 @@ public slots: protected: virtual void clearWidget( TQWidget *aWidget ); - virtual TQWidget* createWidget( TQWidget *tqparent ); + virtual TQWidget* createWidget( TQWidget *parent ); private: void regenerateActionListFromWidgets(); @@ -344,7 +344,7 @@ public: /** Create the filter dialog. The only class which should be able to do this is KMFilterMgr. This ensures that there is only a single filter dialog */ - KMFilterDlg( TQWidget* tqparent=0, const char* name=0, bool popFilter=false, + KMFilterDlg( TQWidget* parent=0, const char* name=0, bool popFilter=false, bool createDummyFilter=true ); /** Called from KMFilterMgr. Creates a new filter and presets diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp index 565bbcc0f..9118d14c8 100644 --- a/kmail/kmfiltermgr.cpp +++ b/kmail/kmfiltermgr.cpp @@ -125,16 +125,16 @@ int KMFilterMgr::moveMessage(KMMessage *msg) const void KMFilterMgr::endFiltering(KMMsgBase *msgBase) const { - KMFolder *tqparent = msgBase->tqparent(); - if ( tqparent ) { - if ( tqparent == MessageProperty::filterFolder( msgBase ) ) { - tqparent->take( tqparent->find( msgBase ) ); + KMFolder *parent = msgBase->parent(); + if ( parent ) { + if ( parent == MessageProperty::filterFolder( msgBase ) ) { + parent->take( parent->find( msgBase ) ); } else if ( ! MessageProperty::filterFolder( msgBase ) ) { - int index = tqparent->find( msgBase ); - KMMessage *msg = tqparent->getMsg( index ); - tqparent->take( index ); - tqparent->addMsgKeepUID( msg ); + int index = parent->find( msgBase ); + KMMessage *msg = parent->getMsg( index ); + parent->take( index ); + parent->addMsgKeepUID( msg ); } } MessageProperty::setFiltering( msgBase, false ); @@ -392,7 +392,7 @@ void KMFilterMgr::openDialog( TQWidget *, bool checkForEmptyFilterList ) if( !mEditDialog ) { // - // We can't use the tqparent as long as the dialog is modeless + // We can't use the parent as long as the dialog is modeless // and there is one shared dialog for all top level windows. // mEditDialog = new KMFilterDlg( 0, "filterdialog", bPopFilter, diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h index 4aae19918..6b0130af2 100644 --- a/kmail/kmfiltermgr.h +++ b/kmail/kmfiltermgr.h @@ -55,7 +55,7 @@ public: /** Open an edit dialog. If checkForEmptyFilterList is true, an empty filter is created to improve the visibility of the dialog in case no filter has been defined so far. */ - void openDialog( TQWidget *tqparent, bool checkForEmptyFilterList = true ); + void openDialog( TQWidget *parent, bool checkForEmptyFilterList = true ); /** Open an edit dialog, create a new filter and preset the first rule with "field equals value" */ diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index 08fe43e01..df8b4daf1 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -90,13 +90,13 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - tqparent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); + parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ), - tqparent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); + parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - tqparent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); + parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ), - tqparent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); + parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); } // Resend all mStorage signals @@ -284,11 +284,11 @@ KMFolderDir* KMFolder::createChildFolder() else if( folderType() == KMFolderTypeImap ) newType = KMImapDir; - mChild = new KMFolderDir( this, tqparent(), childName, newType ); + mChild = new KMFolderDir( this, parent(), childName, newType ); if( !mChild ) return 0; mChild->reload(); - tqparent()->append( mChild ); + parent()->append( mChild ); return mChild; } @@ -593,8 +593,8 @@ TQString KMFolder::label() const TQString KMFolder::prettyURL() const { TQString parentUrl; - if ( tqparent() ) - parentUrl = tqparent()->prettyURL(); + if ( parent() ) + parentUrl = parent()->prettyURL(); if ( !parentUrl.isEmpty() ) return parentUrl + '/' + label(); else @@ -704,11 +704,11 @@ void KMFolder::correctUnreadMsgsCount() TQString KMFolder::idString() const { - KMFolderNode* folderNode = tqparent(); + KMFolderNode* folderNode = parent(); if (!folderNode) return ""; - while ( folderNode->tqparent() ) - folderNode = folderNode->tqparent(); + while ( folderNode->parent() ) + folderNode = folderNode->parent(); TQString myPath = path(); int pathLen = myPath.length() - folderNode->path().length(); TQString relativePath = myPath.right( pathLen ); @@ -890,7 +890,7 @@ void KMFolder::slotContentsTypeChanged( KMail::FolderContentsType type ) void KMFolder::slotFolderSizeChanged() { emit folderSizeChanged( this ); - KMFolder* papa = tqparent()->manager()->parentFolder( this ); + KMFolder* papa = parent()->manager()->parentFolder( this ); if ( papa && papa != this ) { papa->slotFolderSizeChanged(); } diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index 67e77665e..60db26661 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -74,9 +74,9 @@ public: /** * Constructs a new Folder object. - * @param tqparent The directory in the folder storage hierarchy under which + * @param parent The directory in the folder storage hierarchy under which * the folder's storage will be found or created. - * @param name If name of the folder. In case there is no tqparent directory, because + * @param name If name of the folder. In case there is no parent directory, because * the folder is free-standing (/var/spool/mail/foo), this is used for the full path to * the folder's storage location. * @param aFolderType The type of folder to create. @@ -87,7 +87,7 @@ public: * the global MsgDict for lookup. * @return A new folder instance. */ - KMFolder( KMFolderDir* tqparent, const TQString& name, + KMFolder( KMFolderDir* parent, const TQString& name, KMFolderType aFolderType, bool withIndex = true, bool exportedSernums = true ); ~KMFolder(); diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index d23a6ea5c..10dfff5af 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -102,10 +102,10 @@ static KMFolderCachedImap::IncidencesFor incidencesForFromString( const TQString return KMFolderCachedImap::IncForAdmins; // by default } -DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* tqparent, +DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n( "Troubleshooting IMAP Cache" ), - Ok | Cancel, Cancel, tqparent, name, true ), + Ok | Cancel, Cancel, parent, name, true ), rc( None ) { TQFrame* page = plainPage(); @@ -239,13 +239,13 @@ void KMFolderCachedImap::reallyDoClose( const char* owner ) KMFolderMaildir::reallyDoClose( owner ); } -void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* tqparent ) +void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* parent ) { - setAccount( tqparent->account() ); + setAccount( parent->account() ); // Now that we have an account, tell it that this folder was created: // if this folder was just removed, then we don't really want to remove it from the server. mAccount->removeDeletedFolder( imapPath() ); - setUserRights( tqparent->userRights(), tqparent->userRightsState() ); + setUserRights( parent->userRights(), parent->userRightsState() ); } void KMFolderCachedImap::readConfig() @@ -2264,11 +2264,11 @@ void KMFolderCachedImap::listDirectory2() } if ( root && !mSubfolderNames.isEmpty() ) { - KMFolderCachedImap* tqparent = + KMFolderCachedImap* parent = findParent( mSubfolderPaths.first(), mSubfolderNames.first() ); - if ( tqparent ) { + if ( parent ) { kdDebug(5006) << "KMFolderCachedImap::listDirectory2 - pass listing to " - << tqparent->label() << endl; + << parent->label() << endl; mSubfolderNames.clear(); } } @@ -2392,18 +2392,18 @@ void KMFolderCachedImap::createFoldersNewOnServerAndFinishListing( const TQValue KMFolderCachedImap* KMFolderCachedImap::findParent( const TQString& path, const TQString& name ) { - TQString tqparent = path.left( path.length() - name.length() - 2 ); - if ( tqparent.length() > 1 ) + TQString parent = path.left( path.length() - name.length() - 2 ); + if ( parent.length() > 1 ) { - // extract name of the tqparent - tqparent = tqparent.right( tqparent.length() - 1 ); - if ( tqparent != label() ) + // extract name of the parent + parent = parent.right( parent.length() - 1 ); + if ( parent != label() ) { KMFolderNode *node = folder()->child()->first(); - // look for a better tqparent + // look for a better parent while ( node ) { - if ( node->name() == tqparent ) + if ( node->name() == parent ) { KMFolder* fld = static_cast<KMFolder*>(node); KMFolderCachedImap* imapFld = @@ -2555,7 +2555,7 @@ KMFolderCachedImap::slotMultiSetACLResult(KIO::Job *job) { KMAcctCachedImap::JobIterator it = mAccount->findJob(job); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + if ( (*it).parent != folder() ) return; // Shouldn't happen if ( job->error() ) // Display error but don't abort the sync just for this @@ -2742,13 +2742,13 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr if ( contentsType != ContentsTypeMail ) kmkernel->iCalIface().setStorageFormat( folder(), KMailICalIfaceImpl::StorageXML ); mAnnotationFolderType = value; - if ( folder()->tqparent()->owner()->idString() != GlobalSettings::self()->theIMAPResourceFolderParent() + if ( folder()->parent()->owner()->idString() != GlobalSettings::self()->theIMAPResourceFolderParent() && GlobalSettings::self()->theIMAPResourceEnabled() && subtype == "default" ) { // Truncate subtype if this folder can't be a default resource folder for us, // 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; + kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: parent folder is " << folder()->parent()->owner()->idString() << " => truncating annotation to " << value << endl; } setContentsType( contentsType ); mAnnotationFolderTypeChanged = false; // we changed it, not the user @@ -2800,8 +2800,8 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job ) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).tqparent == folder() ); - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).parent == folder() ); + if ( (*it).parent != folder() ) return; // Shouldn't happen AnnotationJobs::GetAnnotationJob* annjob = static_cast<AnnotationJobs::GetAnnotationJob *>( job ); if ( annjob->error() ) { @@ -2826,8 +2826,8 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job ) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).tqparent == folder() ); - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).parent == folder() ); + if ( (*it).parent != folder() ) return; // Shouldn't happen TQValueVector<int> folders; AnnotationJobs::MultiUrlGetAnnotationJob* annjob @@ -2878,8 +2878,8 @@ void KMFolderCachedImap::slotQuotaResult( KIO::Job* job ) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).tqparent == folder() ); - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).parent == folder() ); + if ( (*it).parent != folder() ) return; // Shouldn't happen QuotaJobs::GetStorageQuotaJob* quotajob = static_cast<QuotaJobs::GetStorageQuotaJob *>( job ); QuotaInfo empty; @@ -2921,8 +2921,8 @@ void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).tqparent == folder() ); - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).parent == folder() ); + if ( (*it).parent != folder() ) return; // Shouldn't happen mAccount->setAnnotationCheckPassed( true ); if ( job->error() ) { @@ -2940,7 +2940,7 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job) { KMAcctCachedImap::JobIterator it = mAccount->findJob(job); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + if ( (*it).parent != folder() ) return; // Shouldn't happen bool cont = true; if ( job->error() ) { diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h index 87c15f751..dfef783ab 100644 --- a/kmail/kmfoldercachedimap.h +++ b/kmail/kmfoldercachedimap.h @@ -76,7 +76,7 @@ public: RefreshCache }; - DImapTroubleShootDialog( TQWidget* tqparent=0, const char* name=0 ); + DImapTroubleShootDialog( TQWidget* parent=0, const char* name=0 ); static int run(); @@ -100,8 +100,8 @@ public: return locateLocal("data", "kmail/dimap" ); } - /** Usually a tqparent is given. But in some cases there is no - fitting tqparent object available. Then the name of the folder + /** Usually a parent is given. But in some cases there is no + fitting parent object available. Then the name of the folder is used as the absolute path to the folder file. */ KMFolderCachedImap(KMFolder* folder, const char* name=0); virtual ~KMFolderCachedImap(); @@ -110,7 +110,7 @@ public: void reallyDoClose(const char* owner); /** Initialize this storage from another one. Used when creating a child folder */ - void initializeFrom( KMFolderCachedImap* tqparent ); + void initializeFrom( KMFolderCachedImap* parent ); virtual void readConfig(); virtual void writeConfig(); @@ -324,7 +324,7 @@ public: /** * Specify an imap path that is used to create the folder on the server - * Otherwise the tqparent folder is used to construct the path + * Otherwise the parent folder is used to construct the path */ const TQString& imapPathForCreation() { return mImapPathCreation; } void setImapPathForCreation( const TQString& path ) { mImapPathCreation = path; } @@ -407,7 +407,7 @@ protected: /* update progress status */ void newState( int progress, const TQString& synctqStatus ); - /** See if there is a better tqparent then this folder */ + /** See if there is a better parent then this folder */ KMFolderCachedImap* findParent( const TQString& path, const TQString& name ); diff --git a/kmail/kmfoldercombobox.cpp b/kmail/kmfoldercombobox.cpp index 1135b25b7..499d444f1 100644 --- a/kmail/kmfoldercombobox.cpp +++ b/kmail/kmfoldercombobox.cpp @@ -8,8 +8,8 @@ //----------------------------------------------------------------------------- -KMFolderComboBox::KMFolderComboBox( TQWidget *tqparent, char *name ) - : TQComboBox( tqparent, name ) +KMFolderComboBox::KMFolderComboBox( TQWidget *parent, char *name ) + : TQComboBox( parent, name ) { init(); } @@ -17,8 +17,8 @@ KMFolderComboBox::KMFolderComboBox( TQWidget *tqparent, char *name ) //----------------------------------------------------------------------------- -KMFolderComboBox::KMFolderComboBox( bool rw, TQWidget *tqparent, char *name ) - : TQComboBox( rw, tqparent, name ) +KMFolderComboBox::KMFolderComboBox( bool rw, TQWidget *parent, char *name ) + : TQComboBox( rw, parent, name ) { init(); } diff --git a/kmail/kmfoldercombobox.h b/kmail/kmfoldercombobox.h index b53519022..7537c5af8 100644 --- a/kmail/kmfoldercombobox.h +++ b/kmail/kmfoldercombobox.h @@ -17,8 +17,8 @@ class KMFolderComboBox : public TQComboBox TQ_OBJECT public: - KMFolderComboBox( TQWidget *tqparent = 0, char *name = 0 ); - KMFolderComboBox( bool rw, TQWidget *tqparent = 0, char *name = 0 ); + KMFolderComboBox( TQWidget *parent = 0, char *name = 0 ); + KMFolderComboBox( bool rw, TQWidget *parent = 0, char *name = 0 ); /** Select whether the outbox folder is shown. Default is yes. */ void showOutboxFolder(bool shown); diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index a7ebe5c1d..d10e8cfac 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -105,7 +105,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, true, false, true, false); if( mFolderDir ) { - // search the tqparent folder of the folder + // search the parent folder of the folder FolderList::ConstIterator it; int i = 1; for( it = folders.begin(); it != folders.end(); ++it, ++i ) { @@ -234,9 +234,9 @@ void KMFolderDialog::setFolder( KMFolder* folder ) mFolder = folder; } -static void addLine( TQWidget *tqparent, TQVBoxLayout* tqlayout ) +static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout ) { - TQFrame *line = new TQFrame( tqparent, "line" ); + TQFrame *line = new TQFrame( parent, "line" ); line->setGeometry( TQRect( 80, 150, 250, 20 ) ); line->setFrameShape( TQFrame::HLine ); line->setFrameShadow( TQFrame::Sunken ); @@ -247,8 +247,8 @@ static void addLine( TQWidget *tqparent, TQVBoxLayout* tqlayout ) //---------------------------------------------------------------------------- KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, const TQString& aName, - TQWidget* tqparent, const char* name ) - : FolderDiaTab( tqparent, name ), + TQWidget* parent, const char* name ) + : FolderDiaTab( parent, name ), mSharedSeenFlagsCheckBox( 0 ), mDlg( dlg ) { @@ -294,20 +294,20 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, bool parentRightsOk = false; bool folderRightsOk = false; if ( imap ) { - KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ); + KMFolderImap * const parent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ); folderRights = imap->userRights(); folderRightsOk = imap->userRightsState() == KMail::ACLJobs::Ok; - if ( tqparent ) { - parentRights = tqparent->userRights(); - parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; + if ( parent ) { + parentRights = parent->userRights(); + parentRightsOk = parent->userRightsState() == KMail::ACLJobs::Ok; } } else if ( dimap ) { - KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() ); + KMFolderCachedImap * const parent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() ); folderRights = dimap->userRights(); folderRightsOk = dimap->userRightsState() == KMail::ACLJobs::Ok; - if ( tqparent ) { - parentRights = tqparent->userRights(); - parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; + if ( parent ) { + parentRights = parent->userRights(); + parentRightsOk = parent->userRightsState() == KMail::ACLJobs::Ok; } } @@ -325,7 +325,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, mNameEdit->setEnabled( nameChangeAllowed ); if ( !nameChangeAllowed ) { TQToolTip::add( mNameEdit, i18n( "Not enough permissions to rename this folder.\n" - "The tqparent folder doesn't have write support.\n" + "The parent folder doesn't have write support.\n" "A sync is needed after changing the permissions." ) ); } mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") ); @@ -796,8 +796,8 @@ void FolderDiaGeneralTab::slotChangeIcon( TQString icon ) // can't use a const-r //---------------------------------------------------------------------------- KMail::FolderDiaTemplatesTab::FolderDiaTemplatesTab( KMFolderDialog* dlg, - TQWidget* tqparent ) - : FolderDiaTab( tqparent, 0 ), mDlg( dlg ) + TQWidget* parent ) + : FolderDiaTab( parent, 0 ), mDlg( dlg ) { mIsLocalSystemFolder = mDlg->folder()->isSystemFolder(); diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h index 56436ecef..230b4526f 100644 --- a/kmail/kmfolderdia.h +++ b/kmail/kmfolderdia.h @@ -72,8 +72,8 @@ class FolderDiaTab : public TQWidget Q_OBJECT TQ_OBJECT public: - FolderDiaTab( TQWidget *tqparent=0, const char* name=0 ) - : TQWidget( tqparent, name ) {} + FolderDiaTab( TQWidget *parent=0, const char* name=0 ) + : TQWidget( parent, name ) {} virtual void load() = 0; @@ -117,7 +117,7 @@ class FolderDiaGeneralTab : public FolderDiaTab public: FolderDiaGeneralTab( KMFolderDialog* dlg, const TQString& aName, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void load(); virtual bool save(); @@ -167,7 +167,7 @@ class FolderDiaTemplatesTab : public FolderDiaTab TQ_OBJECT public: - FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *tqparent ); + FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *parent ); virtual void load(); virtual bool save(); @@ -203,7 +203,7 @@ class KMFolderDialog : public KDialogBase public: KMFolderDialog( KMFolder *folder, KMFolderDir *aFolderDir, - KMFolderTree* tqparent, const TQString& caption, + KMFolderTree* parent, const TQString& caption, const TQString& name = TQString() ); KMFolder* folder() const { return mFolder; } diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index 1fd5dcd56..77390e61b 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -75,9 +75,9 @@ KMFolderMgr* KMFolderRootDir::manager() const //============================================================================= //============================================================================= -KMFolderDir::KMFolderDir( KMFolder * owner, KMFolderDir* tqparent, +KMFolderDir::KMFolderDir( KMFolder * owner, KMFolderDir* parent, const TQString& name, KMFolderDirType dirType ) - : KMFolderNode( tqparent, name ), KMFolderNodeList(), + : KMFolderNode( parent, name ), KMFolderNodeList(), mOwner( owner ), mDirType( dirType ) { setAutoDelete( true ); @@ -129,9 +129,9 @@ TQString KMFolderDir::path() const { static TQString p; - if (tqparent()) + if (parent()) { - p = tqparent()->path(); + p = parent()->path(); p.append("/"); p.append(name()); } @@ -155,8 +155,8 @@ TQString KMFolderDir::label() const TQString KMFolderDir::prettyURL() const { TQString parentUrl; - if ( tqparent() ) - parentUrl = tqparent()->prettyURL(); + if ( parent() ) + parentUrl = parent()->prettyURL(); if ( !parentUrl.isEmpty() ) return parentUrl + '/' + label(); else @@ -179,7 +179,7 @@ KMFolderType dirTypeToFolderType( KMFolderDirType dirType ) switch( dirType ) { // Use maildir for normal folder dirs, as this function is only called when finding a dir - // without a tqparent folder, which can only happen with maildir-like folders + // without a parent folder, which can only happen with maildir-like folders case KMStandardDir: return KMFolderTypeMaildir; case KMImapDir: return KMFolderTypeImap; @@ -354,7 +354,7 @@ KMFolderNode* KMFolderDir::hasNamedFolder(const TQString& aName) //----------------------------------------------------------------------------- KMFolderMgr* KMFolderDir::manager() const { - return tqparent()->manager(); + return parent()->manager(); } diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index b78e82e8e..687f95637 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -18,7 +18,7 @@ class KMFolderDir: public KMFolderNode, public KMFolderNodeList TQ_OBJECT public: - KMFolderDir( KMFolder * owner, KMFolderDir * tqparent = 0, + KMFolderDir( KMFolder * owner, KMFolderDir * parent = 0, const TQString& path = TQString(), KMFolderDirType = KMStandardDir ); virtual ~KMFolderDir(); diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index 21fb82d14..05a7864d1 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -153,14 +153,14 @@ KMMessage* KMFolderImap::getMsg(int idx) KMAcctImap* KMFolderImap::account() const { if ( !mAccount ) { - KMFolderDir *parentFolderDir = dynamic_cast<KMFolderDir*>( folder()->tqparent() ); + KMFolderDir *parentFolderDir = dynamic_cast<KMFolderDir*>( folder()->parent() ); if ( !parentFolderDir ) { - kdWarning() << k_funcinfo << "No tqparent folder dir found for " << name() << endl; + kdWarning() << k_funcinfo << "No parent folder dir found for " << name() << endl; return 0; } KMFolder *parentFolder = parentFolderDir->owner(); if ( !parentFolder ) { - kdWarning() << k_funcinfo << "No tqparent folder found for " << name() << endl; + kdWarning() << k_funcinfo << "No parent folder found for " << name() << endl; return 0; } KMFolderImap *parentStorage = dynamic_cast<KMFolderImap*>( parentFolder->storage() ); @@ -321,7 +321,7 @@ int KMFolderImap::rename( const TQString& newName, KMFolderDir *aParent ) //----------------------------------------------------------------------------- void KMFolderImap::addMsgQuiet(KMMessage* aMsg) { - KMFolder *aFolder = aMsg->tqparent(); + KMFolder *aFolder = aMsg->parent(); TQ_UINT32 serNum = 0; aMsg->setTransferInProgress( false ); if (aFolder) { @@ -351,7 +351,7 @@ void KMFolderImap::addMsgQuiet(TQPtrList<KMMessage> msgList) mAddMessageProgressItem->setComplete(); mAddMessageProgressItem = 0; } - KMFolder *aFolder = msgList.first()->tqparent(); + KMFolder *aFolder = msgList.first()->parent(); int undoId = -1; bool uidplus = account()->hasCapability("uidplus"); for ( KMMessage* msg = msgList.first(); msg; msg = msgList.next() ) @@ -371,7 +371,7 @@ void KMFolderImap::addMsgQuiet(TQPtrList<KMMessage> msgList) if ( aFolder ) { aFolder->take( msgList ); } else { - kdDebug(5006) << k_funcinfo << "no tqparent" << endl; + kdDebug(5006) << k_funcinfo << "no parent" << endl; } msgList.setAutoDelete(true); msgList.clear(); @@ -392,7 +392,7 @@ int KMFolderImap::addMsg(KMMessage* aMsg, int* aIndex_ret) int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex_ret) { KMMessage *aMsg = msgList.getFirst(); - KMFolder *msgParent = aMsg->tqparent(); + KMFolder *msgParent = aMsg->parent(); ImapJob *imapJob = 0; if (msgParent) @@ -483,7 +483,7 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex imapJob = new ImapJob( msgList, TQString(), ImapJob::tPutMessage, this ); if ( !mAddMessageProgressItem && msgList.count() > 1 ) { - // use a tqparent progress if we have more than 1 message + // use a parent progress if we have more than 1 message // otherwise the normal progress is more accurate mAddMessageProgressItem = ProgressManager::createProgressItem( "Uploading"+ProgressManager::getUniqueID(), @@ -786,17 +786,17 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames, initInbox(); } - // see if we have a better tqparent + // see if we have a better parent // if you have a prefix that contains a folder (e.g "INBOX.") the folders // need to be created underneath it if ( root && !subfolderNames.empty() ) { - KMFolderImap* tqparent = findParent( subfolderPaths.first(), subfolderNames.first() ); - if ( tqparent ) + KMFolderImap* parent = findParent( subfolderPaths.first(), subfolderNames.first() ); + if ( parent ) { kdDebug(5006) << "KMFolderImap::slotListResult - pass listing to " - << tqparent->label() << endl; - tqparent->slotListResult( subfolderNames, subfolderPaths, + << parent->label() << endl; + parent->slotListResult( subfolderNames, subfolderPaths, subfolderMimeTypes, subfolderAttributes, jobData ); // cleanup TQStringList list; @@ -914,18 +914,18 @@ void KMFolderImap::initInbox() //----------------------------------------------------------------------------- KMFolderImap* KMFolderImap::findParent( const TQString& path, const TQString& name ) { - TQString tqparent = path.left( path.length() - name.length() - 2 ); - if ( tqparent.length() > 1 ) + TQString parent = path.left( path.length() - name.length() - 2 ); + if ( parent.length() > 1 ) { - // extract name of the tqparent - tqparent = tqparent.right( tqparent.length() - 1 ); - if ( tqparent != label() ) + // extract name of the parent + parent = parent.right( parent.length() - 1 ); + if ( parent != label() ) { KMFolderNode *node = folder()->child()->first(); - // look for a better tqparent + // look for a better parent while ( node ) { - if ( node->name() == tqparent ) + if ( node->name() == parent ) { KMFolder* fld = static_cast<KMFolder*>(node); KMFolderImap* imapFld = static_cast<KMFolderImap*>( fld->storage() ); @@ -984,10 +984,10 @@ void KMFolderImap::checkFolders( const TQStringList& subfolderNames, } //----------------------------------------------------------------------------- -void KMFolderImap::initializeFrom( KMFolderImap* tqparent, TQString folderPath, +void KMFolderImap::initializeFrom( KMFolderImap* parent, TQString folderPath, TQString mimeType ) { - setAccount( tqparent->account() ); + setAccount( parent->account() ); setImapPath( folderPath ); setNoContent( mimeType == "inode/directory" ); setNoChildren( mimeType == "message/digest" ); @@ -1060,10 +1060,10 @@ void KMFolderImap::checkValidity() } // otherwise we already are inside a mailcheck if ( !mMailCheckProgressItem ) { - ProgressItem* tqparent = ( account()->checkingSingleFolder() ? 0 : + ProgressItem* parent = ( account()->checkingSingleFolder() ? 0 : account()->mailCheckProgressItem() ); mMailCheckProgressItem = ProgressManager::createProgressItem( - tqparent, + parent, "MailCheck" + folder()->prettyURL(), TQStyleSheet::escape( folder()->prettyURL() ), i18n("checking"), @@ -1327,7 +1327,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) // strip the flags from the list of uids, so it can be reused for (uid = (*it).items.begin(); uid != (*it).items.end(); ++uid) (*uid).truncate((*uid).find(",")); - ImapAccountBase::jobData jd( TQString(), (*it).tqparent ); + ImapAccountBase::jobData jd( TQString(), (*it).parent ); jd.total = (*it).items.count(); if (jd.total == 0) { @@ -1509,7 +1509,7 @@ void KMFolderImap::ignoreJobsForMessage( KMMessage* msg ) { if ( !msg || msg->transferInProgress() || - !msg->tqparent() || msg->tqparent()->folderType() != KMFolderTypeImap ) + !msg->parent() || msg->parent()->folderType() != KMFolderTypeImap ) return; KMAcctImap *account; if ( !(account = static_cast<KMFolderImap*>(msg->storage())->account()) ) @@ -1721,15 +1721,15 @@ void KMFolderImap::slotGetMessagesResult(KIO::Job * job) void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath, bool askUser) { - kdDebug(5006) << "KMFolderImap::createFolder - name=" << name << ",tqparent=" << + kdDebug(5006) << "KMFolderImap::createFolder - name=" << name << ",parent=" << parentPath << ",askUser=" << askUser << endl; if ( account()->makeConnection() != ImapAccountBase::Connected ) { kdWarning(5006) << "KMFolderImap::createFolder - got no connection" << endl; return; } KURL url = account()->getUrl(); - TQString tqparent = ( parentPath.isEmpty() ? imapPath() : parentPath ); - TQString path = account()->createImapPath( tqparent, name ); + TQString parent = ( parentPath.isEmpty() ? imapPath() : parentPath ); + TQString path = account()->createImapPath( parent, name ); if ( askUser ) { path += "/;INFO=ASKUSER"; } @@ -1824,7 +1824,7 @@ void KMFolderImap::deleteMessage(KMMessage * msg) mUidMetaDataMap.remove( msg->UID() ); mMetaDataMap.remove( msg->msgIdMD5() ); KURL url = account()->getUrl(); - KMFolderImap *msg_tqparent = static_cast<KMFolderImap*>(msg->storage()); + KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msg->storage()); ulong uid = msg->UID(); /* If the uid is empty the delete job below will nuke all mail in the folder, so we better safeguard against that. See ::expungeFolder, as @@ -1834,7 +1834,7 @@ void KMFolderImap::deleteMessage(KMMessage * msg) "an empty UID. Aborting." << endl; return; } - url.setPath(msg_tqparent->imapPath() + ";UID=" + TQString::number(uid) ); + url.setPath(msg_parent->imapPath() + ";UID=" + TQString::number(uid) ); if ( account()->makeConnection() != ImapAccountBase::Connected ) return; KIO::SimpleJob *job = KIO::file_delete(url, false); @@ -1860,14 +1860,14 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) TQStringList sets = makeSets(uids); KURL url = account()->getUrl(); - KMFolderImap *msg_tqparent = static_cast<KMFolderImap*>(msgList.getFirst()->storage()); + KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msgList.getFirst()->storage()); for ( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString uid = *it; // Don't delete with no uid, that nukes the folder. Should not happen, but // better safe than sorry. if ( uid.isEmpty() ) continue; - url.setPath(msg_tqparent->imapPath() + ";UID=" + uid); + url.setPath(msg_parent->imapPath() + ";UID=" + uid); if ( account()->makeConnection() != ImapAccountBase::Connected ) return; KIO::SimpleJob *job = KIO::file_delete(url, false); diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index f303325b6..c7b31588f 100644 --- a/kmail/kmfolderimap.h +++ b/kmail/kmfolderimap.h @@ -99,8 +99,8 @@ public: virtual imapState getSubfolderState() { return mSubfolderState; } virtual void setSubfolderState(imapState state); - /** Usually a tqparent is given. But in some cases there is no - fitting tqparent object available. Then the name of the folder + /** Usually a parent is given. But in some cases there is no + fitting parent object available. Then the name of the folder is used as the absolute path to the folder file. */ KMFolderImap(KMFolder* folder, const char* name=0); virtual ~KMFolderImap(); @@ -321,7 +321,7 @@ public: virtual bool isMoveable() const; /** Initialize this storage from another one. Used when creating a child folder */ - void initializeFrom( KMFolderImap* tqparent, TQString path, TQString mimeType ); + void initializeFrom( KMFolderImap* parent, TQString path, TQString mimeType ); /** Returns the IMAP flags that can be stored on the server. */ int permanentFlags() const { return mPermanentFlags; } @@ -363,7 +363,7 @@ public slots: virtual int addMsg(TQPtrList<KMMessage>&, TQValueList<int>& index_return); /** Copy the messages to this folder */ - void copyMsg(TQPtrList<KMMessage>& msgList/*, KMFolder* tqparent*/); + void copyMsg(TQPtrList<KMMessage>& msgList/*, KMFolder* parent*/); /** Detach message from this folder. Usable to call addMsg() afterwards. @@ -438,7 +438,7 @@ protected: /** Create or find the INBOX and initialize it */ void initInbox(); - /** See if there is a better tqparent then this folder */ + /** See if there is a better parent then this folder */ KMFolderImap* findParent( const TQString& path, const TQString& name ); /** See if all folders are still present on server, otherwise delete them */ diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index 28743c497..b0682ff00 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -39,7 +39,7 @@ class KMFolderIndex: public FolderStorage Q_OBJECT TQ_OBJECT //TODO:Have to get rid of this friend declaration and add necessary pure - //virtuals to kmfolder.h so that KMMsgBase::tqparent() can be a plain KMFolder + //virtuals to kmfolder.h so that KMMsgBase::parent() can be a plain KMFolder //rather than a KMFolderIndex. Need this for database indices. friend class ::KMMsgBase; public: @@ -53,8 +53,8 @@ public: IndexTooOld }; - /** Usually a tqparent is given. But in some cases there is no - fitting tqparent object available. Then the name of the folder + /** Usually a parent is given. But in some cases there is no + fitting parent object available. Then the name of the folder is used as the absolute path to the folder file. */ KMFolderIndex(KMFolder* folder, const char* name=0); virtual ~KMFolderIndex(); diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 8c54e3c24..8390de4f9 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -375,7 +375,7 @@ if( fileD0.open( IO_WriteOnly ) ) { int rc; // take message out of the folder it is currently in, if any - msgParent = aMsg->tqparent(); + msgParent = aMsg->parent(); if (msgParent) { if (msgParent==folder() && !kmkernel->folderIsDraftOrOutbox(folder())) diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h index 83cb0b689..ea02d9b11 100644 --- a/kmail/kmfoldermaildir.h +++ b/kmail/kmfoldermaildir.h @@ -27,8 +27,8 @@ class KMFolderMaildir : public KMFolderIndex TQ_OBJECT friend class ::KMail::MaildirJob; public: - /** Usually a tqparent is given. But in some cases there is no - fitting tqparent object available. Then the name of the folder + /** Usually a parent is given. But in some cases there is no + fitting parent object available. Then the name of the folder is used as the absolute path to the folder file. */ KMFolderMaildir(KMFolder* folder, const char* name=0); virtual ~KMFolderMaildir(); diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index d77a8ae46..3aebc8f3b 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -950,7 +950,7 @@ int KMFolderMbox::addMsg( KMMessage* aMsg, int* aIndex_ret ) } // take message out of the folder it is currently in, if any - msgParent = aMsg->tqparent(); + msgParent = aMsg->parent(); if (msgParent) { if ( msgParent== folder() ) diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h index cf8871372..d37411447 100644 --- a/kmail/kmfoldermbox.h +++ b/kmail/kmfoldermbox.h @@ -52,8 +52,8 @@ class KMFolderMbox : public KMFolderIndex public: - /** Usually a tqparent is given. But in some cases there is no - fitting tqparent object available. Then the name of the folder + /** Usually a parent is given. But in some cases there is no + fitting parent object available. Then the name of the folder is used as the absolute path to the folder file. */ KMFolderMbox(KMFolder* folder, const char* name=0); virtual ~KMFolderMbox(); diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index e66e77761..c4df4904d 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -368,17 +368,17 @@ void KMFolderMgr::removeFolder(KMFolder* aFolder) KMFolder* KMFolderMgr::parentFolder( KMFolder* folder ) { - // find the tqparent folder by stripping "." and ".directory" from the name - KMFolderDir* fdir = folder->tqparent(); + // find the parent folder by stripping "." and ".directory" from the name + KMFolderDir* fdir = folder->parent(); 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( parentName ); + KMFolderNode* parent = fdir->hasNamedFolder( parentName ); + if ( !parent && fdir->parent() ) // dimap obviously has a different structure + parent = fdir->parent()->hasNamedFolder( parentName ); KMFolder* parentF = 0; - if ( tqparent ) - parentF = dynamic_cast<KMFolder*>( tqparent ); + if ( parent ) + parentF = dynamic_cast<KMFolder*>( parent ); return parentF; } @@ -389,7 +389,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) return; } - KMFolderDir* fdir = aFolder->tqparent(); + KMFolderDir* fdir = aFolder->parent(); KMFolderNode* fN; for (fN = fdir->first(); fN != 0; fN = fdir->next()) { if (fN->isDir() && (fN->name() == "." + aFolder->fileName() + ".directory")) { @@ -400,7 +400,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) KMFolder* parentF = parentFolder( aFolder ); // aFolder will be deleted by the next call! - aFolder->tqparent()->remove(aFolder); + aFolder->parent()->remove(aFolder); // update the tqchildren state if ( parentF ) @@ -411,10 +411,10 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) } } else - kdWarning(5006) << "Can not find tqparent folder" << endl; + kdWarning(5006) << "Can not find parent folder" << endl; if (aFolder == mRemoveOrig) { - // call only if we're removing the original tqparent folder + // call only if we're removing the original parent folder contentsChanged(); mRemoveOrig = 0; } @@ -425,7 +425,7 @@ void KMFolderMgr::removeDirAux(KMFolderDir* aFolderDir) TQDir dir; TQString folderDirLocation = aFolderDir->path(); aFolderDir->clear(); - aFolderDir->tqparent()->remove(aFolderDir); + aFolderDir->parent()->remove(aFolderDir); dir.rmdir(folderDirLocation); } diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h index 01009347a..2a0808bbb 100644 --- a/kmail/kmfoldermgr.h +++ b/kmail/kmfoldermgr.h @@ -122,7 +122,7 @@ public: /** Copy a folder */ void copyFolder( KMFolder* folder, KMFolderDir* newParent ); - /** Returns the tqparent Folder for the given folder or 0 on failure. */ + /** Returns the parent Folder for the given folder or 0 on failure. */ KMFolder* parentFolder( KMFolder* folder ); public slots: diff --git a/kmail/kmfoldernode.cpp b/kmail/kmfoldernode.cpp index e8ba86f52..fee6c2a2b 100644 --- a/kmail/kmfoldernode.cpp +++ b/kmail/kmfoldernode.cpp @@ -7,9 +7,9 @@ #include "kmfolderdir.h" //----------------------------------------------------------------------------- -KMFolderNode::KMFolderNode( KMFolderDir * tqparent, const TQString & name ) +KMFolderNode::KMFolderNode( KMFolderDir * parent, const TQString & name ) : mName( name ), - mParent( tqparent ), + mParent( parent ), mDir( false ), mId( 0 ) { @@ -31,7 +31,7 @@ bool KMFolderNode::isDir(void) const //----------------------------------------------------------------------------- TQString KMFolderNode::path() const { - if (tqparent()) return tqparent()->path(); + if (parent()) return parent()->path(); return TQString(); } @@ -42,7 +42,7 @@ TQString KMFolderNode::label(void) const } //----------------------------------------------------------------------------- -KMFolderDir* KMFolderNode::tqparent(void) const +KMFolderDir* KMFolderNode::parent(void) const { return mParent; } diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h index a3bb03c39..aec47e3b4 100644 --- a/kmail/kmfoldernode.h +++ b/kmail/kmfoldernode.h @@ -32,7 +32,7 @@ class KMFolderNode: public TQObject TQ_OBJECT public: - KMFolderNode( KMFolderDir * tqparent, const TQString & name ); + KMFolderNode( KMFolderDir * parent, const TQString & name ); virtual ~KMFolderNode(); /** Is it a directory where mail folders are stored or is it a folder that @@ -44,12 +44,12 @@ public: /** Returns ptr to owning directory object or 0 if none. This is just a wrapper for convenient access. */ - KMFolderDir* tqparent(void) const ; + KMFolderDir* parent(void) const ; void setParent( KMFolderDir* aParent ); - // { return (KMFolderDir*)KMFolderNodeInherited::tqparent(); } + // { return (KMFolderDir*)KMFolderNodeInherited::parent(); } /** Returns full path to the directory where this node is stored or 0 - if the node has no tqparent. Example: if this object represents a folder + if the node has no parent. Example: if this object represents a folder ~joe/Mail/inbox then path() returns "/home/joe/Mail" and name() returns "inbox". */ virtual TQString path() const; diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index d2345dce0..819d5ff82 100644 --- a/kmail/kmfoldersearch.cpp +++ b/kmail/kmfoldersearch.cpp @@ -69,8 +69,8 @@ #define IDS_SEARCH_HEADER_LEN 30 -KMSearch::KMSearch(TQObject * tqparent, const char * name) - :TQObject(tqparent, name) +KMSearch::KMSearch(TQObject * parent, const char * name) + :TQObject(parent, name) { mRemainingFolders = -1; mRecursive = true; @@ -135,11 +135,11 @@ bool KMSearch::inScope(KMFolder* folder) const return false; KMFolderDir *rootDir = mRoot->child(); - KMFolderDir *ancestorDir = folder->tqparent(); + KMFolderDir *ancestorDir = folder->parent(); while ( ancestorDir ) { if ( ancestorDir == rootDir ) return true; - ancestorDir = ancestorDir->tqparent(); + ancestorDir = ancestorDir->parent(); } return false; } @@ -688,7 +688,7 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg ) this folder via the inherited method, then clear the imap ones. */ FolderStorage::ignoreJobsForMessage( msg ); - if (msg->tqparent()->folderType() == KMFolderTypeImap) { + if (msg->parent()->folderType() == KMFolderTypeImap) { KMAcctImap *account = static_cast<KMFolderImap*>( msg->storage() )->account(); if( !account ) @@ -787,7 +787,7 @@ int KMFolderSearch::writeIndex( bool ) DwString KMFolderSearch::getDwString(int idx) { - return getMsgBase(idx)->tqparent()->getDwString( idx ); + return getMsgBase(idx)->parent()->getDwString( idx ); } KMMessage* KMFolderSearch::readMsg(int idx) @@ -910,7 +910,7 @@ KMMsgInfo* KMFolderSearch::setIndexEntry(int idx, KMMessage *msg) { assert(idx >= 0 && idx < (int)mSerNums.count()); Q_UNUSED( idx ); - return msg->storage()->setIndexEntry(msg->tqparent()->find(msg), msg); + return msg->storage()->setIndexEntry(msg->parent()->find(msg), msg); } void KMFolderSearch::clearIndex(bool, bool) diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h index 728eb6842..3dc9462ed 100644 --- a/kmail/kmfoldersearch.h +++ b/kmail/kmfoldersearch.h @@ -55,7 +55,7 @@ class KMSearch: public TQObject TQ_OBJECT public: - KMSearch(TQObject * tqparent = 0, const char * name = 0); + KMSearch(TQObject * parent = 0, const char * name = 0); ~KMSearch(); bool write(TQString location) const; diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index b1df389ad..fd841ae6a 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -18,16 +18,16 @@ using namespace KMail; //----------------------------------------------------------------------------- -KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * tqparent, const TQString& caption, +KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * parent, const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings ) - : KDialogBase( tqparent, "folder dialog", true, caption, + : KDialogBase( parent, "folder dialog", true, caption, Ok|Cancel|User1, Ok, true, KGuiItem(i18n("&New Subfolder..."), "folder_new", i18n("Create a new subfolder under the currently selected folder")) - ), // mainwin as tqparent, modal + ), // mainwin as parent, modal mUseGlobalSettings( useGlobalSettings ) { - KMFolderTree * ft = tqparent->folderTree(); + KMFolderTree * ft = parent->folderTree(); assert( ft ); TQString preSelection = mUseGlobalSettings ? @@ -40,13 +40,13 @@ KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * tqparent, const TQString& caption } //---------------------------------------------------------------------------- -KMFolderSelDlg::KMFolderSelDlg( TQWidget * tqparent, KMFolderTree * tree, +KMFolderSelDlg::KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree, const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings ) - : KDialogBase( tqparent, "folder dialog", true, caption, + : KDialogBase( parent, "folder dialog", true, caption, Ok|Cancel|User1, Ok, true, KGuiItem(i18n("&New Subfolder..."), "folder_new", i18n("Create a new subfolder under the currently selected folder")) - ), // mainwin as tqparent, modal + ), // mainwin as parent, modal mUseGlobalSettings( useGlobalSettings ) { TQString preSelection = mUseGlobalSettings ? diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h index 81bdd7eba..edc5f6a74 100644 --- a/kmail/kmfolderseldlg.h +++ b/kmail/kmfolderseldlg.h @@ -26,13 +26,13 @@ namespace KMail { public: /** * Constructor with KMMainWidget - * @p tqparent @em must be a KMMainWin, because we + * @p parent @em must be a KMMainWin, because we * need its foldertree. * @param mustBeReadWrite if true, readonly folders are disabled * @param useGlobalSettings if true, the current folder is read and * written to GlobalSettings */ - KMFolderSelDlg( KMMainWidget * tqparent, const TQString& caption, + KMFolderSelDlg( KMMainWidget * parent, const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings = true ); /** * Constructor with separate KMFolderTree @@ -40,7 +40,7 @@ namespace KMail { * @param useGlobalSettings if true, the current folder is read and * written to GlobalSettings */ - KMFolderSelDlg( TQWidget * tqparent, KMFolderTree * tree, + KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree, const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings = true ); diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 6a280856f..aef19abe4 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -51,10 +51,10 @@ using namespace KPIM; //============================================================================= -KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name, +KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name, KFolderTreeItem::Protocol protocol ) - : TQObject( tqparent, name.latin1() ), - KFolderTreeItem( tqparent, name, protocol, Root ), + : TQObject( parent, name.latin1() ), + KFolderTreeItem( parent, name, protocol, Root ), mFolder( 0 ), mNeedsRepaint( true ) { init(); @@ -62,10 +62,10 @@ KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name } //----------------------------------------------------------------------------- -KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name, +KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name, KMFolder* folder ) - : TQObject( tqparent, name.latin1() ), - KFolderTreeItem( tqparent, name ), + : TQObject( parent, name.latin1() ), + KFolderTreeItem( parent, name ), mFolder( folder ), mNeedsRepaint( true ) { init(); @@ -73,10 +73,10 @@ KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name } //----------------------------------------------------------------------------- -KMFolderTreeItem::KMFolderTreeItem( KFolderTreeItem *tqparent, const TQString & name, +KMFolderTreeItem::KMFolderTreeItem( KFolderTreeItem *parent, const TQString & name, KMFolder* folder ) : TQObject( 0, name.latin1() ), - KFolderTreeItem( tqparent, name ), + KFolderTreeItem( parent, name ), mFolder( folder ), mNeedsRepaint( true ) { init(); @@ -373,9 +373,9 @@ void KMFolderTreeItem::updateCount() //============================================================================= -KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *tqparent, +KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent, const char *name ) - : KMail::FolderTreeBase( mainWidget, tqparent, name ) + : KMail::FolderTreeBase( mainWidget, parent, name ) , mUpdateTimer( 0, "mUpdateTimer" ) , autoopen_timer( 0, "autoopen_timer" ) { @@ -712,7 +712,7 @@ void KMFolderTree::slotUpdateOneCount() //----------------------------------------------------------------------------- // Recursively add a directory of folders to the tree of folders -void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent ) +void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) { for ( KMFolderNode * node = fdir->first() ; node ; node = fdir->next() ) { if ( node->isDir() ) @@ -720,7 +720,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent ) KMFolder * folder = static_cast<KMFolder*>(node); KMFolderTreeItem * fti = 0; - if (!tqparent) + if (!parent) { // create new root-item, but only if this is not the root of a // "groupware folders only" account @@ -742,7 +742,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent ) } // create new child - fti = new KMFolderTreeItem( tqparent, folder->label(), folder ); + fti = new KMFolderTreeItem( parent, folder->label(), folder ); // set folders explicitely to exandable when they have tqchildren // this way we can do a listing for IMAP folders when the user expands them // even when the child folders are not created yet @@ -757,7 +757,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent ) addDirectory( folder->child(), fti ); } - // Check if this is an IMAP resource folder or a no-content tqparent only + // Check if this is an IMAP resource folder or a no-content parent only // containing groupware folders if ( (kmkernel->iCalIface().hideResourceFolder( folder ) || folder->noContent()) && fti->childCount() == 0 ) { @@ -858,8 +858,8 @@ void KMFolderTree::slotFolderRemoved(KMFolder *aFolder) // Methods for navigating folders with the keyboard void KMFolderTree::prepareItem( KMFolderTreeItem* fti ) { - for ( TQListViewItem * tqparent = fti->tqparent() ; tqparent ; tqparent = tqparent->tqparent() ) - tqparent->setOpen( true ); + for ( TQListViewItem * parent = fti->parent() ; parent ; parent = parent->parent() ) + parent->setOpen( true ); ensureItemVisible( fti ); } @@ -1086,7 +1086,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, /* Treat the special case of the root and account folders */ if ((!fti->folder() || (fti->folder()->noContent() - && !fti->tqparent()))) + && !fti->parent()))) { TQString createChild = i18n("&New Subfolder..."); if (!fti->folder()) createChild = i18n("&New Folder..."); @@ -1184,7 +1184,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, mMainWidget->action("post_message")->plug(folderMenu); } - if (fti->folder() && fti->tqparent() && !multiFolder) + if (fti->folder() && fti->parent() && !multiFolder) { folderMenu->insertItem(SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), @@ -1264,7 +1264,7 @@ static bool folderHasCreateRights( const KMFolder *folder ) //----------------------------------------------------------------------------- // Create a subfolder. // Requires creating the appropriate subdirectory and show a dialog -void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * tqparent ) +void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent ) { KMFolder *aFolder = folder; if ( !aFolder ) { @@ -1286,8 +1286,8 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * tqparent ) } } - if ( tqparent ) - ( new KMail::NewFolderDialog( tqparent, aFolder ) )->exec(); + if ( parent ) + ( new KMail::NewFolderDialog( parent, aFolder ) )->exec(); else ( new KMail::NewFolderDialog( this, aFolder ) )->show(); return; @@ -1522,8 +1522,8 @@ void KMFolderTree::contentsDropEvent( TQDropEvent *e ) if (fti && mCopySourceFolders.count() == 1) { KMFolder *source = mCopySourceFolders.first(); - // if we are dragging to ourselves or to our tqparent, set fti to 0 so nothing is done - if (source == fti->folder() || source->tqparent()->owner() == fti->folder()) fti = 0; + // if we are dragging to ourselves or to our parent, set fti to 0 so nothing is done + if (source == fti->folder() || source->parent()->owner() == fti->folder()) fti = 0; } if (fti && acceptDrag(e) && ( fti != oldSelected || e->source() != mMainWidget->headers()->viewport() ) ) { @@ -1583,22 +1583,22 @@ void KMFolderTree::slotFolderExpanded( TQListViewItem * item ) KMFolderImap *folder = static_cast<KMFolderImap*>( fti->folder()->storage() ); // if we should list all folders we limit this to the root folder if ( !folder->account() || ( !folder->account()->listOnlyOpenFolders() && - fti->tqparent() ) ) + fti->parent() ) ) return; if ( folder->getSubfolderState() == KMFolderImap::imapNoInformation ) { // check if all parents are expanded - TQListViewItem *tqparent = item->tqparent(); - while ( tqparent ) + TQListViewItem *parent = item->parent(); + while ( parent ) { - if ( !tqparent->isOpen() ) + if ( !parent->isOpen() ) return; - tqparent = tqparent->tqparent(); + parent = parent->parent(); } // the tree will be reloaded after that bool success = folder->listDirectory(); if (!success) fti->setOpen( false ); - if ( fti->childCount() == 0 && fti->tqparent() ) + if ( fti->childCount() == 0 && fti->parent() ) fti->setExpandable( false ); } } @@ -1970,9 +1970,9 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source // Disable drag during copy operation since it prevents from many crashes setDragEnabled( false ); - KMFolderDir* tqparent = &(kmkernel->folderMgr()->dir()); + KMFolderDir* parent = &(kmkernel->folderMgr()->dir()); if ( destination ) - tqparent = destination->createChildFolder(); + parent = destination->createChildFolder(); TQStringList sourceFolderNames; @@ -1985,7 +1985,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source if ( source ) sourceFolderName = source->label(); - if ( tqparent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) { + if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) { KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>") .tqarg( sourceFolderName ) ); setDragEnabled( true ); @@ -2002,19 +2002,19 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source setDragEnabled( true ); return; } - if ( f->tqparent() ) - f = f->tqparent()->owner(); + if ( f->parent() ) + f = f->parent()->owner(); } TQString message = i18n( "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>" ). arg( sourceFolderName ); - KMFolderDir* folderDir = tqparent; + KMFolderDir* folderDir = parent; // check that the folder can be moved if ( source && source->child() ) { while ( folderDir && ( folderDir != &kmkernel->folderMgr()->dir() ) && - ( folderDir != source->tqparent() ) ) + ( folderDir != source->parent() ) ) { if ( folderDir->findRef( source ) != -1 ) { @@ -2022,19 +2022,19 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source setDragEnabled( true ); return; } - folderDir = folderDir->tqparent(); + folderDir = folderDir->parent(); } } - if( source && source->child() && tqparent && - ( tqparent->path().find( source->child()->path() + "/" ) == 0 ) ) { + if( source && source->child() && parent && + ( parent->path().find( source->child()->path() + "/" ) == 0 ) ) { KMessageBox::error( this, message ); setDragEnabled( true ); return; } if( source && source->child() - && ( tqparent == source->child() ) ) { + && ( parent == source->child() ) ) { KMessageBox::error( this, message ); setDragEnabled( true ); return; @@ -2049,14 +2049,14 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source for ( TQValueList<TQGuardedPtr<KMFolder> >::ConstIterator it2 = sources.constBegin(); it2 != sources.constEnd(); ++it2 ) { if ( *it == *it2 ) continue; - KMFolderDir *childDir = (*it2)->tqparent(); + KMFolderDir *childDir = (*it2)->parent(); do { if ( parentDir == childDir || parentDir->findRef( childDir->owner() ) != -1 ) { KMessageBox::error( this, i18n("Moving the selected folders is not possible") ); setDragEnabled( true ); return; } - childDir = childDir->tqparent(); + childDir = childDir->parent(); } while ( childDir && childDir != &kmkernel->folderMgr()->dir() ); } @@ -2074,9 +2074,9 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source if ( move ) { kdDebug(5006) << "move folder " << (source ? source->label(): "Unknown") << " to " << ( destination ? destination->label() : "Local Folders" ) << endl; - kmkernel->folderMgr()->moveFolder( source, tqparent ); + kmkernel->folderMgr()->moveFolder( source, parent ); } else { - kmkernel->folderMgr()->copyFolder( source, tqparent ); + kmkernel->folderMgr()->copyFolder( source, parent ); } } } @@ -2085,7 +2085,7 @@ TQDragObject * KMFolderTree::dragObject() { KMFolderTreeItem *item = static_cast<KMFolderTreeItem*> (itemAt(viewport()->mapFromGlobal(TQCursor::pos()))); - if ( !item || !item->tqparent() || !item->folder() ) // top-level items or something invalid + if ( !item || !item->parent() || !item->folder() ) // top-level items or something invalid return 0; mCopySourceFolders = selectedFolders(); diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h index 73704df4a..f953f0290 100644 --- a/kmail/kmfoldertree.h +++ b/kmail/kmfoldertree.h @@ -48,15 +48,15 @@ class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem TQ_OBJECT public: /** Construct a root item _without_ folder */ - KMFolderTreeItem( KFolderTree *tqparent, const TQString & name, + KMFolderTreeItem( KFolderTree *parent, const TQString & name, KFolderTreeItem::Protocol protocol=KFolderTreeItem::NONE ); /** Construct a root item _with_ folder */ - KMFolderTreeItem( KFolderTree *tqparent, const TQString & name, + KMFolderTreeItem( KFolderTree *parent, const TQString & name, KMFolder* folder ); /** Construct a child item */ - KMFolderTreeItem( KFolderTreeItem* tqparent, const TQString & name, + KMFolderTreeItem( KFolderTreeItem* parent, const TQString & name, KMFolder* folder ); virtual ~KMFolderTreeItem(); @@ -68,7 +68,7 @@ public: /** associated folder */ KMFolder* folder() const { return mFolder; } - TQListViewItem* tqparent() const { return KFolderTreeItem::tqparent(); } + TQListViewItem* parent() const { return KFolderTreeItem::parent(); } /** Adjust the unread count from the folder and update the * pixmaps accordingly. */ @@ -112,14 +112,14 @@ class KMFolderTree : public KMail::FolderTreeBase TQ_OBJECT public: - KMFolderTree( KMMainWidget *mainWidget, TQWidget *tqparent=0, + KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent=0, const char *name=0 ); /** Save config options */ void writeConfig(); /** Recusively add folders in a folder directory to a listview item. */ - virtual void addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent ); + virtual void addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ); /** create a folderlist */ void createFolderList( TQStringList *str, @@ -226,7 +226,7 @@ public slots: void slotResetFolderList( TQListViewItem* item = 0, bool startList = true ); /** Create a child folder */ - void addChildFolder( KMFolder *folder = 0, TQWidget * tqparent = 0 ); + void addChildFolder( KMFolder *folder = 0, TQWidget * parent = 0 ); /** Copies the currently selected folder. */ void copyFolder(); diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index d8c30d074..9d721e9da 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -92,9 +92,9 @@ TQPixmap* KMHeaders::pixReadFwdReplied = 0; //----------------------------------------------------------------------------- -KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *tqparent, +KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, const char *name) : - KListView( tqparent, name ), + KListView( parent, name ), mIgnoreSortOrderChanges( false ) { static bool pixmapsLoaded = false; @@ -920,26 +920,26 @@ void KMHeaders::msgAdded(int id) msgId = ""; TQString replyToId = mFolder->getMsgBase(id)->replyToIdMD5(); - SortCacheItem *tqparent = findParent( sci ); - if (!tqparent && mSubjThreading) { - tqparent = findParentBySubject( sci ); - if (tqparent && sci->isImperfectlyThreaded()) { - // The tqparent we found could be by subject, in which case it is + SortCacheItem *parent = findParent( sci ); + if (!parent && mSubjThreading) { + parent = findParentBySubject( sci ); + if (parent && sci->isImperfectlyThreaded()) { + // The parent we found could be by subject, in which case it is // possible, that it would be preferrable to thread it below us, // not the other way around. Check that. This is not only // cosmetic, as getting this wrong leads to circular threading. - if (msgId == mFolder->getMsgBase(tqparent->item()->msgId())->replyToIdMD5() - || msgId == mFolder->getMsgBase(tqparent->item()->msgId())->replyToAuxIdMD5()) - tqparent = NULL; + if (msgId == mFolder->getMsgBase(parent->item()->msgId())->replyToIdMD5() + || msgId == mFolder->getMsgBase(parent->item()->msgId())->replyToAuxIdMD5()) + parent = NULL; } } - if (tqparent && mFolder->getMsgBase(tqparent->id())->isWatched()) + if (parent && mFolder->getMsgBase(parent->id())->isWatched()) mFolder->getMsgBase(id)->setqStatus( KMMsgStatusWatched ); - else if (tqparent && mFolder->getMsgBase(tqparent->id())->isIgnored()) + else if (parent && mFolder->getMsgBase(parent->id())->isIgnored()) mFolder->getMsgBase(id)->setqStatus( KMMsgStatusIgnored ); - if (tqparent) - hi = new HeaderItem( tqparent->item(), id ); + if (parent) + hi = new HeaderItem( parent->item(), id ); else hi = new HeaderItem( this, id ); @@ -955,7 +955,7 @@ void KMHeaders::msgAdded(int id) mSortCacheItems.replace(msgId, sci); /* Add to the list of potential parents for subject threading. But only if * we are top level. */ - if (mSubjThreading && tqparent) { + if (mSubjThreading && parent) { TQString subjMD5 = mFolder->getMsgBase(id)->strippedSubjectMD5(); if (subjMD5.isEmpty()) { mFolder->getMsgBase(id)->initStrippedSubjectMD5(); @@ -977,7 +977,7 @@ void KMHeaders::msgAdded(int id) sci->setSubjectThreadingList( mSubjectLists[subjMD5] ); } } - // The message we just added might be a better tqparent for one of the as of + // The message we just added might be a better parent for one of the as of // yet imperfectly threaded messages. Let's find out. /* In case the current item is taken during reparenting, prevent qlistview @@ -1017,8 +1017,8 @@ void KMHeaders::msgAdded(int id) TQListViewItem *newParent = mItems[id]; TQListViewItem *msg = mItems[tryMe]; - if (msg->tqparent()) - msg->tqparent()->takeItem(msg); + if (msg->parent()) + msg->parent()->takeItem(msg); else takeItem(msg); newParent->insertItem(msg); @@ -1029,7 +1029,7 @@ void KMHeaders::msgAdded(int id) if (perfectParent) { mImperfectlyThreadedList.removeRef (mItems[tryMe]); - // The item was imperfectly thread before, now it's tqparent + // The item was imperfectly thread before, now it's parent // is there. Update the .sorted file accordingly. TQString sortFile = KMAIL_SORT_FILE(mFolder); FILE *sortStream = fopen(TQFile::encodeName(sortFile), "r+"); @@ -1115,12 +1115,12 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() ) removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() ); - // Retqparent tqchildren of item. + // Reparent tqchildren of item. TQListViewItem *myParent = removedItem; TQListViewItem *myChild = myParent->firstChild(); TQListViewItem *threadRoot = myParent; - while (threadRoot->tqparent()) - threadRoot = threadRoot->tqparent(); + while (threadRoot->parent()) + threadRoot = threadRoot->parent(); TQString key = static_cast<HeaderItem*>(threadRoot)->key(mSortCol, !mSortDescending); TQPtrList<TQListViewItem> childList; @@ -1148,25 +1148,25 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) TQListViewItem *lvi = *it; HeaderItem *item = static_cast<HeaderItem*>(lvi); SortCacheItem *sci = item->sortCacheItem(); - SortCacheItem *tqparent = findParent( sci ); - if ( !tqparent && mSubjThreading ) - tqparent = findParentBySubject( sci ); + SortCacheItem *parent = findParent( sci ); + if ( !parent && mSubjThreading ) + parent = findParentBySubject( sci ); - Q_ASSERT( !tqparent || tqparent->item() != removedItem ); + Q_ASSERT( !parent || parent->item() != removedItem ); myParent->takeItem(lvi); - if ( tqparent && tqparent->item() != item && tqparent->item() != removedItem ) { - tqparent->item()->insertItem(lvi); - tqparent->addSortedChild( sci ); + if ( parent && parent->item() != item && parent->item() != removedItem ) { + parent->item()->insertItem(lvi); + parent->addSortedChild( sci ); } else { insertItem(lvi); mRoot->addSortedChild( sci ); } - if ((!tqparent || sci->isImperfectlyThreaded()) + if ((!parent || sci->isImperfectlyThreaded()) && !mImperfectlyThreadedList.containsRef(item)) mImperfectlyThreadedList.append(item); - if (tqparent && !sci->isImperfectlyThreaded() + if (parent && !sci->isImperfectlyThreaded() && mImperfectlyThreadedList.containsRef(item)) mImperfectlyThreadedList.removeRef(item); } @@ -1242,8 +1242,8 @@ TQPtrList<TQListViewItem> KMHeaders::currentThread() const // ...find the top-level item: TQListViewItem *topOfThread = curItem; - while ( topOfThread->tqparent() ) - topOfThread = topOfThread->tqparent(); + while ( topOfThread->parent() ) + topOfThread = topOfThread->parent(); // collect the items in this thread: TQPtrList<TQListViewItem> list; @@ -1266,8 +1266,8 @@ void KMHeaders::setThreadtqStatus(KMMsgtqStatus status, bool toggle) if (item->isSelected() ) { // ...find the top-level item: TQListViewItem *top = item; - while ( top->tqparent() ) - top = top->tqparent(); + while ( top->parent() ) + top = top->parent(); if (!topOfThreads.contains(top)) { topOfThreads.append(top); } @@ -1313,11 +1313,11 @@ int KMHeaders::slotFilterMsg(KMMessage *msg) kmkernel->emergencyExit( i18n("Unable to process messages: " ) + TQString::fromLocal8Bit(strerror(errno))); return 2; } - if (msg->tqparent()) { // unGet this msg + if (msg->parent()) { // unGet this msg int idx = -1; KMFolder * p = 0; KMMsgDict::instance()->getLocation( msg, &p, &idx ); - assert( p == msg->tqparent() ); assert( idx >= 0 ); + assert( p == msg->parent() ); assert( idx >= 0 ); p->unGetMsg( idx ); } @@ -1328,13 +1328,13 @@ int KMHeaders::slotFilterMsg(KMMessage *msg) void KMHeaders::slotExpandOrCollapseThread( bool expand ) { if ( !isThreaded() ) return; - // find top-level tqparent of currentItem(). + // find top-level parent of currentItem(). TQListViewItem *item = currentItem(); if ( !item ) return; clearSelection(); item->setSelected( true ); - while ( item->tqparent() ) - item = item->tqparent(); + while ( item->parent() ) + item = item->parent(); HeaderItem * hdrItem = static_cast<HeaderItem*>(item); hdrItem->setOpenRecursive( expand ); if ( !expand ) // collapse can hide the current item: @@ -1358,8 +1358,8 @@ void KMHeaders::slotExpandOrCollapseAllThreads( bool expand ) if ( !expand ) { // collapse can hide the current item: TQListViewItem * item = currentItem(); if( item ) { - while ( item->tqparent() ) - item = item->tqparent(); + while ( item->parent() ) + item = item->parent(); setCurrentMsg( static_cast<HeaderItem*>(item)->msgId() ); } } @@ -1713,7 +1713,7 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected ) if ( item->isVisible() ) KListView::setSelected( item, selected ); - // If the item is the tqparent of a closed thread recursively select + // If the item is the parent of a closed thread recursively select // tqchildren . if ( isThreaded() && !item->isOpen() && item->firstChild() ) { TQListViewItem *nextRoot = item->itemBelow(); @@ -1826,7 +1826,7 @@ void KMHeaders::selectNextMessage() if (lvi && below ) { while (temp) { temp->firstChild(); - temp = temp->tqparent(); + temp = temp->parent(); } lvi->tqrepaint(); /* test to see if we need to unselect messages on back track */ @@ -1864,7 +1864,7 @@ void KMHeaders::selectPrevMessage() if (lvi && above) { while (temp) { temp->firstChild(); - temp = temp->tqparent(); + temp = temp->parent(); } lvi->tqrepaint(); /* test to see if we need to unselect messages on back track */ @@ -2000,8 +2000,8 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept // root and recursively sort all of that ancestors tqchildren. if (item) { TQListViewItem *next = item; - while (next->tqparent()) - next = next->tqparent(); + while (next->parent()) + next = next->parent(); next = static_cast<HeaderItem*>(next)->firstChildNonConst(); while (next && (next != item)) if (static_cast<HeaderItem*>(next)->firstChildNonConst()) @@ -2010,7 +2010,7 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept next = next->nextSibling(); else { while (next && (next != item)) { - next = next->tqparent(); + next = next->parent(); if (next == item) break; if (next && next->nextSibling()) { @@ -2288,7 +2288,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) && ( mPressPos.x() >= header()->cellPos( header()->mapToActual( 0 ) ) ); if ( rootDecoClicked ) { - // Check if our item is the tqparent of a closed thread and if so, if the root + // Check if our item is the parent of a closed thread and if so, if the root // decoration of the item was clicked (i.e. the +/- sign) which would expand // the thread. In that case, deselect all tqchildren, so opening the thread // doesn't cause a flicker. @@ -2315,7 +2315,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) } if ( rootDecoClicked ) { - // select the thread's tqchildren after closing if the tqparent is selected + // select the thread's tqchildren after closing if the parent is selected if ( lvi && !lvi->isOpen() && lvi->isSelected() ) setSelected( lvi, true ); } @@ -2324,12 +2324,12 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) if ( lvi != currentItem() ) highlightMessage( lvi ); /* Explicitely set selection state. This is necessary because we want to - * also select all tqchildren of closed threads when the tqparent is selected. */ + * also select all tqchildren of closed threads when the parent is selected. */ - // unless ctrl tqmask, set selected if it isn't already + // unless ctrl mask, set selected if it isn't already if ( !( e->state() & ControlButton ) && !wasSelected ) setSelected( lvi, true ); - // if ctrl tqmask, toggle selection + // if ctrl mask, toggle selection if ( e->state() & ControlButton ) setSelected( lvi, !wasSelected ); @@ -2768,7 +2768,7 @@ bool KMHeaders::writeSortOrder() KMMsgBase *kmb; while(HeaderItem *i = items.pop()) { - int parent_id = -1; //no tqparent, top level + int parent_id = -1; //no parent, top level if (threaded) { kmb = mFolder->getMsgBase( i->msgId() ); assert(kmb); // I have seen 0L come out of this, called from @@ -2782,7 +2782,7 @@ bool KMHeaders::writeSortOrder() if (p) parent_id = p->id(); - // We now have either found a tqparent, or set it to -1, which means that + // We now have either found a parent, 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, // this message is top level, and will always be, so no need to @@ -2792,7 +2792,7 @@ bool KMHeaders::writeSortOrder() && !kmb->subjectIsPrefixed() ) 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 + // their arrival, since it becomes very unlikely that a new parent for // them will show up. (Ingo suggests a month.) -till } internalWriteItem(sortStream, mFolder, i->msgId(), parent_id, @@ -2828,13 +2828,13 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) { TQString sortFile = KMAIL_SORT_FILE(mFolder); if(FILE *sortStream = fopen(TQFile::encodeName(sortFile), "r+")) { - int parent_id = -1; //no tqparent, top level + int parent_id = -1; //no parent, top level if (isThreaded()) { SortCacheItem *sci = khi->sortCacheItem(); KMMsgBase *kmb = mFolder->getMsgBase( khi->msgId() ); - if(sci->tqparent() && !sci->isImperfectlyThreaded()) - parent_id = sci->tqparent()->id(); + if(sci->parent() && !sci->isImperfectlyThreaded()) + parent_id = sci->parent()->id(); else if(kmb->replyToIdMD5().isEmpty() && kmb->replyToAuxIdMD5().isEmpty() && !kmb->subjectIsPrefixed()) @@ -2872,7 +2872,7 @@ void KMHeaders::dirtySortOrder(int column) // ----------------- void SortCacheItem::updateSortFile( FILE *sortStream, KMFolder *folder, - bool waiting_for_tqparent, bool update_discover) + bool waiting_for_parent, bool update_discover) { if(mSortOffset == -1) { fseek(sortStream, 0, SEEK_END); @@ -2882,7 +2882,7 @@ void SortCacheItem::updateSortFile( FILE *sortStream, KMFolder *folder, } int parent_id = -1; - if(!waiting_for_tqparent) { + if(!waiting_for_parent) { if(mParent && !isImperfectlyThreaded()) parent_id = mParent->id(); } @@ -2931,9 +2931,9 @@ void KMHeaders::printThreadingTree() } for (int i = 0; i < (int)mItems.size(); ++i) { HeaderItem *item = mItems[i]; - 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; + int parentCacheId = item->sortCacheItem()->parent()?item->sortCacheItem()->parent()->id():0; + kdDebug( 5006 ) << "SortCacheItem: " << item->sortCacheItem()->id() << " parent: " << parentCacheId << endl; + kdDebug( 5006 ) << "Item: " << item << " sortCache: " << item->sortCacheItem() << " parent: " << item->sortCacheItem()->parent() << endl; } kdDebug(5006) << endl; } @@ -2962,8 +2962,8 @@ void KMHeaders::buildSubjectThreadingTree( TQMemArray<SortCacheItem *> sortCache for(int x = 0; x < mFolder->count(); x++) { // Only a lot items that are now toplevel - if ( sortCache[x]->tqparent() - && sortCache[x]->tqparent()->id() != -666 ) continue; + if ( sortCache[x]->parent() + && sortCache[x]->parent()->id() != -666 ) continue; KMMsgBase *mi = mFolder->getMsgBase(x); TQString subjMD5 = mi->strippedSubjectMD5(); if (subjMD5.isEmpty()) { @@ -2996,19 +2996,19 @@ void KMHeaders::buildSubjectThreadingTree( TQMemArray<SortCacheItem *> sortCache SortCacheItem* KMHeaders::findParent(SortCacheItem *item) { - SortCacheItem *tqparent = NULL; - if (!item) return tqparent; + SortCacheItem *parent = NULL; + if (!item) return parent; KMMsgBase *msg = mFolder->getMsgBase(item->id()); TQString replyToIdMD5 = msg->replyToIdMD5(); item->setImperfectlyThreaded(true); /* First, try if the message our Reply-To header points to * is available to thread below. */ if(!replyToIdMD5.isEmpty()) { - tqparent = mSortCacheItems[replyToIdMD5]; - if (tqparent) + parent = mSortCacheItems[replyToIdMD5]; + if (parent) item->setImperfectlyThreaded(false); } - if (!tqparent) { + if (!parent) { // If we dont have a replyToId, or if we have one and the // corresponding message is not in this folder, as happens // if you keep your outgoing messages in an OUTBOX, for @@ -3017,15 +3017,15 @@ SortCacheItem* KMHeaders::findParent(SortCacheItem *item) // contains the second to last one. TQString ref = msg->replyToAuxIdMD5(); if (!ref.isEmpty()) - tqparent = mSortCacheItems[ref]; + parent = mSortCacheItems[ref]; } - return tqparent; + return parent; } SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) { - SortCacheItem *tqparent = NULL; - if (!item) return tqparent; + SortCacheItem *parent = NULL; + if (!item) return parent; KMMsgBase *msg = mFolder->getMsgBase(item->id()); @@ -3033,7 +3033,7 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) // This is necessary to make for example cvs commit mailing lists // work as expected without having to turn threading off alltogether. if (!msg->subjectIsPrefixed()) - return tqparent; + return parent; TQString replyToIdMD5 = msg->replyToIdMD5(); TQString subjMD5 = msg->strippedSubjectMD5(); @@ -3043,7 +3043,7 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) for (TQPtrListIterator<SortCacheItem> it2(*mSubjectLists[subjMD5]); it2.current(); ++it2) { KMMsgBase *mb = mFolder->getMsgBase((*it2)->id()); - if ( !mb ) return tqparent; + if ( !mb ) return parent; // make sure it's not ourselves if ( item == (*it2) ) continue; int delta = msg->date() - mb->date(); @@ -3052,12 +3052,12 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) if (delta > 0 ) { // Don't use parents more than 6 weeks older than us. if (delta < 3628899) - tqparent = (*it2); + parent = (*it2); break; } } } - return tqparent; + return parent; } bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) @@ -3118,7 +3118,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) SortCacheItem *item; unsigned long serNum, parentSerNum; - int id, len, tqparent, x; + int id, len, parent, x; TQChar *tmp_qchar = 0; int tmp_qchar_len = 0; const int mFolderCount = mFolder->count(); @@ -3158,14 +3158,14 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) continue; } if (parentSerNum < KMAIL_RESERVED) { - tqparent = (int)parentSerNum - KMAIL_RESERVED; + parent = (int)parentSerNum - KMAIL_RESERVED; } else { - KMMsgDict::instance()->getLocation(parentSerNum - KMAIL_RESERVED, &folder, &tqparent); + KMMsgDict::instance()->getLocation(parentSerNum - KMAIL_RESERVED, &folder, &parent); if (folder != mFolder) - tqparent = -1; + parent = -1; } if ((id < 0) || (id >= mFolderCount) || - (tqparent < -2) || (tqparent >= mFolderCount)) { // sanity checking + (parent < -2) || (parent >= mFolderCount)) { // sanity checking kdDebug(5006) << "Whoa.1! " << __FILE__ << ":" << __LINE__ << endl; error = true; continue; @@ -3183,15 +3183,15 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) } else { item = sortCache[id] = new SortCacheItem(id, key, offset); } - if (threaded && tqparent != -2) { - if(tqparent == -1) { + if (threaded && parent != -2) { + if(parent == -1) { unparented.append(item); mRoot->addUnsortedChild(item); } else { - if( ! sortCache[tqparent] ) { - sortCache[tqparent] = new SortCacheItem; + if( ! sortCache[parent] ) { + sortCache[parent] = new SortCacheItem; } - sortCache[tqparent]->addUnsortedChild(item); + sortCache[parent]->addUnsortedChild(item); } } else { if(x < sorted_count ) @@ -3258,8 +3258,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) SHOW_TIMER(holes); } - // Make sure we've placed everything in tqparent/child relationship. All - // messages with a tqparent id of -1 in the sort file are reevaluated here. + // Make sure we've placed everything in parent/child relationship. All + // messages with a parent id of -1 in the sort file are reevaluated here. if (threaded) buildThreadingTree( sortCache ); TQPtrList<SortCacheItem> toBeSubjThreaded; @@ -3269,10 +3269,10 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) 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 - if ( tqparent && (tqparent != (*it)) ) { - tqparent->addUnsortedChild((*it)); + SortCacheItem *parent = findParent( item ); + // If we have a parent, make sure it's not ourselves + if ( parent && (parent != (*it)) ) { + parent->addUnsortedChild((*it)); if(sortStream) (*it)->updateSortFile(sortStream, mFolder); } else { @@ -3289,10 +3289,10 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) buildSubjectThreadingTree( sortCache ); for(TQPtrListIterator<SortCacheItem> it(toBeSubjThreaded); it.current(); ++it) { SortCacheItem *item = (*it); - SortCacheItem *tqparent = findParentBySubject( item ); + SortCacheItem *parent = findParentBySubject( item ); - if ( tqparent ) { - tqparent->addUnsortedChild((*it)); + if ( parent ) { + parent->addUnsortedChild((*it)); if(sortStream) (*it)->updateSortFile(sortStream, mFolder); } else { @@ -3348,11 +3348,11 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) /* Otherwise use the next item of the unsorted list */ new_kci = unsorted[unsorted_off++]; } - if(new_kci->item() || new_kci->tqparent() != i) //could happen if you reparent + if(new_kci->item() || new_kci->parent() != i) //could happen if you reparent continue; if(threaded && i->item()) { - // If the tqparent is watched or ignored, propagate that to it's + // If the parent is watched or ignored, propagate that to it's // tqchildren if (mFolder->getMsgBase(i->id())->isWatched()) mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusWatched); @@ -3406,7 +3406,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) sortCache[x]->setItem(mItems[sortCache[x]->id()] = khi); } // Add all imperfectly threaded items to a list, so they can be - // reevaluated when a new message arrives which might be a better tqparent. + // reevaluated when a new message arrives which might be a better parent. // Important for messages arriving out of order. if (threaded && sortCache[x]->isImperfectlyThreaded()) { mImperfectlyThreadedList.append(sortCache[x]->item()); @@ -3620,12 +3620,12 @@ TQValueList< TQ_UINT32 > KMHeaders::selectedVisibleSernums() TQListViewItemIterator it(this, TQListViewItemIterator::Selected|TQListViewItemIterator::Visible); while( it.current() ) { if ( it.current()->isSelected() && it.current()->isVisible() ) { - if ( it.current()->tqparent() && ( !it.current()->tqparent()->isOpen() ) ) { - // the item's tqparent is closed, don't traverse any more of this subtree - TQListViewItem * lastAncestorWithSiblings = it.current()->tqparent(); + if ( it.current()->parent() && ( !it.current()->parent()->isOpen() ) ) { + // the item's parent is closed, don't traverse any more of this subtree + TQListViewItem * lastAncestorWithSiblings = it.current()->parent(); // travel towards the root until we find an ancestor with siblings while ( ( lastAncestorWithSiblings->depth() > 0 ) && !lastAncestorWithSiblings->nextSibling() ) - lastAncestorWithSiblings = lastAncestorWithSiblings->tqparent(); + lastAncestorWithSiblings = lastAncestorWithSiblings->parent(); // move the iterator to that ancestor's next sibling it = TQListViewItemIterator( lastAncestorWithSiblings->nextSibling() ); continue; diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index e6bbe4223..f504c3f30 100644 --- a/kmail/kmheaders.h +++ b/kmail/kmheaders.h @@ -53,7 +53,7 @@ class KMHeaders : public KListView friend class ::KMail::HeaderItem; // For easy access to the pixmaps public: - KMHeaders(KMMainWidget *owner, TQWidget *tqparent=0, const char *name=0); + KMHeaders(KMMainWidget *owner, TQWidget *parent=0, const char *name=0); virtual ~KMHeaders(); /** A new folder has been selected update the list of headers shown @@ -114,7 +114,7 @@ public: /** Returns the sernums of all selected items. */ TQValueList<TQ_UINT32> selectedSernums(); - /** Returns the sernums of all visible (ie. items with expanded tqparent, not hidden by + /** Returns the sernums of all visible (ie. items with expanded parent, not hidden by eg. the quick search) selected items. */ TQValueList<TQ_UINT32> selectedVisibleSernums(); @@ -285,12 +285,12 @@ public slots: virtual void ensureCurrentItemVisible(); - /** Select an item and if it is the tqparent of a closed thread, also + /** Select an item and if it is the parent of a closed thread, also recursively select its tqchildren. */ virtual void setSelected(TQListViewItem *item, bool selected); /** Select several items by message index - * and if they are the tqparent of a closed thread, also + * and if they are the parent of a closed thread, also * recursively select their tqchildren. */ void setSelectedByIndex(TQValueList<int> items, bool selected); diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 7a05280e9..f93f4ae5c 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -98,8 +98,8 @@ static bool s_askingToGoOnline = false; /********************************************************************/ /* Constructor and destructor */ /********************************************************************/ -KMKernel::KMKernel (TQObject *tqparent, const char *name) : - DCOPObject("KMailIface"), TQObject(tqparent, name), +KMKernel::KMKernel (TQObject *parent, const char *name) : + DCOPObject("KMailIface"), TQObject(parent, name), mIdentityManager(0), mConfigureDialog(0), mContextMenuShown( false ), mWallet( 0 ) { @@ -1156,7 +1156,7 @@ bool KMKernel::showMail( TQ_UINT32 serialNumber, TQString /* messageId */ ) KMReaderMainWin *win = new KMReaderMainWin( false, false ); KMMessage *newMessage = new KMMessage( *msg ); - newMessage->setParent( msg->tqparent() ); + newMessage->setParent( msg->parent() ); newMessage->setMsgSerNum( msg->getMsgSerNum() ); newMessage->setReadyToShow( true ); win->showMsg( GlobalSettings::self()->overrideCharacterEncoding(), newMessage ); @@ -2464,7 +2464,7 @@ Wallet *KMKernel::wallet() { if ( !Wallet::isEnabled() || walletOpenFailed ) return 0; - // find an appropriate tqparent window for the wallet dialog + // find an appropriate parent window for the wallet dialog WId window = 0; if ( tqApp->activeWindow() ) window = tqApp->activeWindow()->winId(); diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 871582ace..d94451237 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -86,7 +86,7 @@ class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface TQ_OBJECT public: - KMKernel (TQObject *tqparent=0, const char *name=0); + KMKernel (TQObject *parent=0, const char *name=0); ~KMKernel (); /** dcop callable stuff */ diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index e43f8cceb..2b17d2170 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -30,8 +30,8 @@ KMLineEdit::KMLineEdit(bool useCompletion, - TQWidget *tqparent, const char *name) - : KPIM::AddresseeLineEdit(tqparent,useCompletion,name) + TQWidget *parent, const char *name) + : KPIM::AddresseeLineEdit(parent,useCompletion,name) { allowSemiColonAsSeparator( GlobalSettings::allowSemicolonAsAddressSeparator() ); } @@ -210,8 +210,8 @@ void KMLineEdit::loadContacts() KMLineEditSpell::KMLineEditSpell(bool useCompletion, - TQWidget *tqparent, const char *name) - : KMLineEdit(useCompletion,tqparent,name) + TQWidget *parent, const char *name) + : KMLineEdit(useCompletion,parent,name) { } diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h index 70c8316fe..5537b0063 100644 --- a/kmail/kmlineeditspell.h +++ b/kmail/kmlineeditspell.h @@ -14,7 +14,7 @@ class KMLineEdit : public KPIM::AddresseeLineEdit Q_OBJECT TQ_OBJECT public: - KMLineEdit(bool useCompletion, TQWidget *tqparent = 0, + KMLineEdit(bool useCompletion, TQWidget *parent = 0, const char *name = 0); signals: @@ -22,7 +22,7 @@ signals: void focusDown(); protected: - // Inherited. Always called by the tqparent when this widget is created. + // Inherited. Always called by the parent when this widget is created. virtual void loadContacts(); virtual void keyPressEvent(TQKeyEvent*); @@ -43,7 +43,7 @@ class KMLineEditSpell : public KMLineEdit Q_OBJECT TQ_OBJECT public: - KMLineEditSpell(bool useCompletion, TQWidget *tqparent = 0, + KMLineEditSpell(bool useCompletion, TQWidget *parent = 0, const char *name = 0); void highLightWord( unsigned int length, unsigned int pos ); void spellCheckDone( const TQString &s ); diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index a32c61c99..88884b696 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -135,10 +135,10 @@ TQValueList<KMMainWidget*>* KMMainWidget::s_mainWidgetList = 0; static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd; //----------------------------------------------------------------------------- -KMMainWidget::KMMainWidget(TQWidget *tqparent, const char *name, +KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient, KActionCollection *actionCollection, KConfig* config ) : - TQWidget(tqparent, name), + TQWidget(parent, name), mFavoritesCheckMailAction( 0 ), mFavoriteFolderView( 0 ), mFolderView( 0 ), @@ -1096,7 +1096,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem ) { KMFolder* folder = folderItem->folder(); KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() ); - KMFolderDialog props( folder, folder->tqparent(), folderTree, + KMFolderDialog props( folder, folder->parent(), folderTree, i18n("Properties of Folder %1").tqarg( folder->label() ) ); props.exec(); updateFolderMenu(); @@ -1763,7 +1763,7 @@ void KMMainWidget::slotDebugSieve() void KMMainWidget::slotStartCertManager() { KProcess certManagerProc; // save to create on the heap, since - // there is no tqparent + // there is no parent certManagerProc << "kleopatra"; if( !certManagerProc.start( KProcess::DontCare ) ) @@ -2120,7 +2120,7 @@ void KMMainWidget::showOfflinePage() //----------------------------------------------------------------------------- void KMMainWidget::slotMsgSelected(KMMessage *msg) { - if ( msg && msg->tqparent() && !msg->isComplete() ) + if ( msg && msg->parent() && !msg->isComplete() ) { if ( msg->transferInProgress() ) return; @@ -2131,7 +2131,7 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg) disconnect( mJob, 0, mMsgView, 0 ); delete mJob; } - mJob = msg->tqparent()->createJob( msg, FolderJob::tGetMessage, 0, + mJob = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, "STRUCTURE", mMsgView->attachmentStrategy() ); connect(mJob, TQT_SIGNAL(messageRetrieved(KMMessage*)), mMsgView, TQT_SLOT(slotMessageArrived(KMMessage*))); @@ -2316,8 +2316,8 @@ void KMMainWidget::slotDisplayCurrentMessage() void KMMainWidget::slotMsgActivated(KMMessage *msg) { if ( !msg ) return; - if ( msg->tqparent() && !msg->isComplete() ) { - FolderJob *job = msg->tqparent()->createJob( msg ); + if ( msg->parent() && !msg->isComplete() ) { + FolderJob *job = msg->parent()->createJob( msg ); connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), TQT_SLOT( slotMsgActivated( KMMessage* ) ) ); job->start(); @@ -2340,7 +2340,7 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg) : reader.readBoolEntry( "useFixedFont", false ); win->setUseFixedFont( useFixedFont ); KMMessage *newMessage = new KMMessage(*msg); - newMessage->setParent( msg->tqparent() ); + newMessage->setParent( msg->parent() ); newMessage->setMsgSerNum( msg->getMsgSerNum() ); newMessage->setReadyToShow( true ); win->showMsg( overrideEncoding(), newMessage ); @@ -2703,7 +2703,7 @@ void KMMainWidget::setupActions() KAction *act; //----- Tools menu - if (tqparent()->inherits("KMMainWin")) { + if (parent()->inherits("KMMainWin")) { act = new KAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); if (KStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false); @@ -3328,7 +3328,7 @@ void KMMainWidget::updateMessageActions() for ( TQPtrListIterator<TQListViewItem> it( selectedItems ) ; it.current() ; ++ it ) { TQListViewItem * item = *it; - if ( item->tqparent()==0 && item->childCount()==0 ) { + if ( item->parent()==0 && item->childCount()==0 ) { allSelectedInCommonThread = false; break; } @@ -3587,7 +3587,7 @@ void KMMainWidget::slotChangeCaption(TQListViewItem * i) if ( !i ) return; // set the caption to the current full path TQStringList names; - for ( TQListViewItem * item = i ; item ; item = item->tqparent() ) + for ( TQListViewItem * item = i ; item ; item = item->parent() ) names.prepend( item->text(0) ); emit captionChangeRequest( names.join( "/" ) ); } diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index 1bb3ee067..26e5eee3f 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -85,7 +85,7 @@ class KDE_EXPORT KMMainWidget : public TQWidget TQ_OBJECT public: - KMMainWidget(TQWidget *tqparent, const char *name, + KMMainWidget(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient, KActionCollection *actionCollection, KConfig*config = KMKernel::config() ); @@ -262,7 +262,7 @@ protected: KActionCollection * actionCollection() const { return mActionCollection; } - /** @return the correct config dialog depending on whether the tqparent of the mainWidget + /** @return the correct config dialog depending on whether the parent of the mainWidget * is a KPart or a KMMainWindow. When dealing with geometries, use this pointer */ KConfig * config(); diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h index 006020e82..1cafbc3da 100644 --- a/kmail/kmmainwin.h +++ b/kmail/kmmainwin.h @@ -40,7 +40,7 @@ class KMMainWin : public KMainWindow public: // the main window needs to have a name since else restoring the window // settings by kwin doesn't work - KMMainWin(TQWidget *tqparent = 0); + KMMainWin(TQWidget *parent = 0); virtual ~KMMainWin(); KMMainWidget *mainKMWidget() const { return mKMMainWidget; }; StatusbarProgressWidget* progressWidget() const { return mLittleProgress; } diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index d4ef0ec49..45ab58870 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -97,7 +97,7 @@ KMMessage::KMMessage(DwMessage* aMsg) } //----------------------------------------------------------------------------- -KMMessage::KMMessage(KMFolder* tqparent): KMMsgBase(tqparent) +KMMessage::KMMessage(KMFolder* parent): KMMsgBase(parent) { init(); } @@ -248,10 +248,10 @@ void KMMessage::setTransferInProgress(bool value, bool force) MessageProperty::setTransferInProgress( getMsgSerNum(), value, force ); if ( !transferInProgress() && sPendingDeletes.contains( this ) ) { sPendingDeletes.remove( this ); - if ( tqparent() ) { - int idx = tqparent()->find( this ); + if ( parent() ) { + int idx = parent()->find( this ); if ( idx > 0 ) { - tqparent()->removeMsg( idx ); + parent()->removeMsg( idx ); } } } @@ -883,9 +883,9 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, msg->setCharset("utf-8"); // determine the mailing list posting address - if ( tqparent() && tqparent()->isMailingListEnabled() && - !tqparent()->mailingListPostAddress().isEmpty() ) { - mailingListAddresses << tqparent()->mailingListPostAddress(); + if ( parent() && parent()->isMailingListEnabled() && + !parent()->mailingListPostAddress().isEmpty() ) { + mailingListAddresses << parent()->mailingListPostAddress(); } if ( headerField("List-Post").find( "mailto:", 0, false ) != -1 ) { TQString listPost = headerField("List-Post"); @@ -1084,8 +1084,8 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, // setqStatus(KMMsgStatusReplied); msg->link(this, KMMsgStatusReplied); - if ( tqparent() && tqparent()->putRepliesInSameFolder() ) - msg->setFcc( tqparent()->idString() ); + if ( parent() && parent()->putRepliesInSameFolder() ) + msg->setFcc( parent()->idString() ); // replies to an encrypted message should be encrypted as well if ( encryptionState() == KMMsgPartiallyEncrypted || @@ -1729,8 +1729,8 @@ uint KMMessage::identityUoid() const { if ( !ok || id == 0 ) id = kmkernel->identityManager()->identityForAddress( to() + ", " + cc() ).uoid(); - if ( id == 0 && tqparent() ) - id = tqparent()->identity(); + if ( id == 0 && parent() ) + id = parent()->identity(); return id; } @@ -4275,7 +4275,7 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray & TQString specifier = partSpecifier; if ( partSpecifier.endsWith(".HEADER") || partSpecifier.endsWith(".MIME") ) { - // get the tqparent bodypart + // get the parent bodypart specifier = partSpecifier.section( '.', 0, -2 ); } @@ -4309,16 +4309,16 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray & TQString parentSpec = partSpecifier.section( '.', 0, -2 ); if ( !parentSpec.isEmpty() ) { - DwBodyPart* tqparent = findDwBodyPart( getFirstDwBodyPart(), parentSpec ); - if ( tqparent && tqparent->hasHeaders() && tqparent->Headers().HasContentType() ) + DwBodyPart* parent = findDwBodyPart( getFirstDwBodyPart(), parentSpec ); + if ( parent && parent->hasHeaders() && parent->Headers().HasContentType() ) { - const DwMediaType& contentType = tqparent->Headers().ContentType(); + const DwMediaType& contentType = parent->Headers().ContentType(); if ( contentType.Type() == DwMime::kTypeMessage && contentType.Subtype() == DwMime::kSubtypeRfc822 ) { // an embedded message that is not multipart // update this directly - tqparent->Body().Message()->Body().FromString( content ); + parent->Body().Message()->Body().FromString( content ); } } } diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index e15732b95..8f870f443 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -71,7 +71,7 @@ class KMMessage: public KMMsgBase, public KMail::ISubject public: // promote some of KMMsgBase's methods to public: - using KMMsgBase::tqparent; + using KMMsgBase::parent; using KMMsgBase::setParent; using KMMsgBase::enableUndo; // KMFolder using KMMsgBase::setEnableUndo; // dto. @@ -85,7 +85,7 @@ public: using KMMsgBase::setSignatureStateChar; // dto. /** Straight forward initialization. */ - KMMessage(KMFolder* tqparent=0); + KMMessage(KMFolder* parent=0); /** Constructor from a DwMessage. KMMessage takes possession of the DwMessage, so don't dare to delete it. @@ -274,7 +274,7 @@ public: /** @return the UOID of the identity for this message. Searches the "x-kmail-identity" header and if that fails, searches with KPIM::IdentityManager::identityForAddress() - and if that fails queries the KMMsgBase::tqparent() folder for a default. + and if that fails queries the KMMsgBase::parent() folder for a default. **/ uint identityUoid() const; diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 730ad54d5..cd05ee38c 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -55,9 +55,9 @@ KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin, - TQWidget* tqparent, + TQWidget* parent, const char* name ) - : KListView( tqparent, name ), + : KListView( parent, name ), mReaderWin( readerWin ), mSizeColumn(0) { setStyleDependantFrameWidth(); @@ -245,8 +245,8 @@ void KMMimePartTree::correctSize( TQListViewItem * item ) } if ( totalSize > static_cast<KMMimePartTreeItem*>(item)->origSize() ) item->setText( mSizeColumn, KIO::convertSize(totalSize) ); - if ( item->tqparent() ) - correctSize( item->tqparent() ); + if ( item->parent() ) + correctSize( item->parent() ); } void KMMimePartTree::slotDelete() @@ -313,13 +313,13 @@ void KMMimePartTree::slotCopy() } //============================================================================= -KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * tqparent, +KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * parent, partNode* node, const TQString & description, const TQString & mimetype, const TQString & encoding, KIO::filesize_t size ) - : TQListViewItem( tqparent, description, + : TQListViewItem( parent, description, TQString(), // set by setIconAndTextForType() encoding, KIO::convertSize( size ) ), @@ -328,18 +328,18 @@ KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * tqparent, if( node ) node->setMimePartTreeItem( this ); setIconAndTextForType( mimetype ); - if ( tqparent ) - tqparent->correctSize(this); + if ( parent ) + parent->correctSize(this); } -KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTreeItem * tqparent, +KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTreeItem * parent, partNode* node, const TQString & description, const TQString & mimetype, const TQString & encoding, KIO::filesize_t size, bool revertOrder ) - : TQListViewItem( tqparent, description, + : TQListViewItem( parent, description, TQString(), // set by setIconAndTextForType() encoding, KIO::convertSize( size ) ), diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h index f520a7950..c8d3c598f 100644 --- a/kmail/kmmimeparttree.h +++ b/kmail/kmmimeparttree.h @@ -52,7 +52,7 @@ class KMMimePartTree : public KListView public: KMMimePartTree( KMReaderWin* readerWin, - TQWidget* tqparent, + TQWidget* parent, const char* name = 0 ); virtual ~KMMimePartTree(); @@ -98,13 +98,13 @@ protected: class KMMimePartTreeItem :public TQListViewItem { public: - KMMimePartTreeItem( KMMimePartTree * tqparent, + KMMimePartTreeItem( KMMimePartTree * parent, partNode* node, const TQString & labelDescr, const TQString & labelCntType = TQString(), const TQString & labelEncoding = TQString(), KIO::filesize_t size=0 ); - KMMimePartTreeItem( KMMimePartTreeItem * tqparent, + KMMimePartTreeItem( KMMimePartTreeItem * parent, partNode* node, const TQString & labelDescr, const TQString & labelCntType = TQString(), diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index 94d5d966e..43a101027 100644 --- a/kmail/kmmsgbase.h +++ b/kmail/kmmsgbase.h @@ -152,7 +152,7 @@ public: KMFolderIndex* storage() const; /** Return owning folder. */ - KMFolder* tqparent() const { return mParent; } + KMFolder* parent() const { return mParent; } /** Set owning folder. */ void setParent(KMFolder* p) { mParent = p; } @@ -219,7 +219,7 @@ public: virtual KMMsgtqStatus status(void) const = 0; /** Set status and mark dirty. Optional optimization: @p idx may - * specify the index of this message within the tqparent folder. */ + * specify the index of this message within the parent folder. */ virtual void setqStatus(const KMMsgtqStatus status, int idx = -1); virtual void toggletqStatus(const KMMsgtqStatus status, int idx = -1); virtual void setqStatus(const char* statusField, const char* xstatusField=0); @@ -238,22 +238,22 @@ public: /** Set encryption status of the message and mark dirty. Optional * optimization: @p idx may specify the index of this message within - * the tqparent folder. */ + * the parent folder. */ virtual void setEncryptionState(const KMMsgEncryptionState, int idx = -1); /** Set signature status of the message and mark dirty. Optional * optimization: @p idx may specify the index of this message within - * the tqparent folder. */ + * the parent folder. */ virtual void setSignatureState(const KMMsgSignatureState, int idx = -1); /** Set encryption status of the message and mark dirty. Optional * optimization: @p idx may specify the index of this message within - * the tqparent folder. */ + * the parent folder. */ virtual void setEncryptionStateChar( TQChar status, int idx = -1 ); /** Set signature status of the message and mark dirty. Optional * optimization: @p idx may specify the index of this message within - * the tqparent folder. */ + * the parent folder. */ virtual void setSignatureStateChar( TQChar status, int idx = -1 ); /** Important header fields of the message that are also kept in the index. */ diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp index f49437928..729a3663a 100644 --- a/kmail/kmmsgdict.cpp +++ b/kmail/kmmsgdict.cpp @@ -303,7 +303,7 @@ unsigned long KMMsgDict::remove(const KMMsgBase *msg) void KMMsgDict::update(const KMMsgBase *msg, int index, int newIndex) { - KMMsgDictREntry *rentry = msg->tqparent()->storage()->rDict(); + KMMsgDictREntry *rentry = msg->parent()->storage()->rDict(); if (rentry) { KMMsgDictEntry *entry = rentry->get(index); if (entry) { diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h index 567354483..a3d50c449 100644 --- a/kmail/kmmsginfo.h +++ b/kmail/kmmsginfo.h @@ -29,7 +29,7 @@ class KMMessage; class KMMsgInfo: public KMMsgBase { public: - KMMsgInfo(KMFolder* tqparent, off_t off=0, short len=0); + KMMsgInfo(KMFolder* parent, off_t off=0, short len=0); virtual ~KMMsgInfo(); /** left for old style index files */ diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index 8ab55358d..e4c41a402 100644 --- a/kmail/kmmsgpart.h +++ b/kmail/kmmsgpart.h @@ -212,10 +212,10 @@ public: /** If this part is complete (contains a body) */ bool isComplete() { return (!mBody.isNull()); } - /** Returns the tqparent part */ - KMMessagePart* tqparent() { return mParent; } + /** Returns the parent part */ + KMMessagePart* parent() { return mParent; } - /** Set the tqparent of this part */ + /** Set the parent of this part */ void setParent( KMMessagePart* part ) { mParent = part; } /** Returns true if the headers should be loaded */ diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp index 167ff8deb..4a1b94fbc 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -44,10 +44,10 @@ static const int numEncodingTypes = sizeof encodingTypes / sizeof *encodingTypes; KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, - TQWidget * tqparent, const char * name ) + TQWidget * parent, const char * name ) : KDialogBase( Plain, caption.isEmpty() ? i18n("Message Part Properties") : caption, - Ok|Cancel|Help, Ok, tqparent, name, true, true) + Ok|Cancel|Help, Ok, parent, name, true, true) { // tmp vars: TQGridLayout * glay; @@ -331,8 +331,8 @@ void KMMsgPartDialog::slotMimeTypeChanged( const TQString & mimeType ) { -KMMsgPartDialogCompat::KMMsgPartDialogCompat( TQWidget * tqparent, const char *, bool readOnly) - : KMMsgPartDialog(TQString(), tqparent ), mMsgPart( 0 ) +KMMsgPartDialogCompat::KMMsgPartDialogCompat( TQWidget * parent, const char *, bool readOnly) + : KMMsgPartDialog(TQString(), parent ), mMsgPart( 0 ) { setShownEncodings( SevenBit|EightBit|QuotedPrintable|Base64 ); if (readOnly) diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h index eb69c0bec..723ebda7e 100644 --- a/kmail/kmmsgpartdlg.h +++ b/kmail/kmmsgpartdlg.h @@ -43,7 +43,7 @@ class KMMsgPartDialog: public KDialogBase public: KMMsgPartDialog( const TQString & caption=TQString(), - TQWidget * tqparent=0, const char * name=0 ); + TQWidget * parent=0, const char * name=0 ); virtual ~KMMsgPartDialog(); /** Get the currently selected mimetype */ @@ -142,7 +142,7 @@ class KMMsgPartDialogCompat : public KMMsgPartDialog { Q_OBJECT TQ_OBJECT public: - KMMsgPartDialogCompat( TQWidget * tqparent=0, const char * caption=0, bool=FALSE ); + KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE ); virtual ~KMMsgPartDialogCompat(); /** Display information about this message part. */ diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index f07ba8fe3..af62b411d 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -156,15 +156,15 @@ void KMReaderMainWin::showMsg( const TQString & encoding, KMMessage *msg, menuBar()->show(); toolBar( "mainToolBar" )->show(); - connect ( msg->tqparent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) ); + connect ( msg->parent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) ); } void KMReaderMainWin::slotFolderRemoved( TQObject* folderPtr ) { assert(mMsg); - assert(folderPtr == mMsg->tqparent()); - if( mMsg && folderPtr == mMsg->tqparent() ) + assert(folderPtr == mMsg->parent()); + if( mMsg && folderPtr == mMsg->parent() ) mMsg->setParent( 0 ); } @@ -181,18 +181,18 @@ void KMReaderMainWin::slotTrashMsg() if ( !mMsg ) return; // find the real msg by its sernum - KMFolder* tqparent; + KMFolder* parent; int index; - KMMsgDict::instance()->getLocation( mMsg->getMsgSerNum(), &tqparent, &index ); - if ( tqparent && !tqparent->isTrash() ) { + KMMsgDict::instance()->getLocation( mMsg->getMsgSerNum(), &parent, &index ); + if ( parent && !parent->isTrash() ) { // open the folder (ref counted) - tqparent->open("trashmsg"); - KMMessage *msg = tqparent->getMsg( index ); + parent->open("trashmsg"); + KMMessage *msg = parent->getMsg( index ); if (msg) { - KMDeleteMsgCommand *command = new KMDeleteMsgCommand( tqparent, msg ); + KMDeleteMsgCommand *command = new KMDeleteMsgCommand( parent, msg ); command->start(); } - tqparent->close("trashmsg"); + parent->close("trashmsg"); } close(); } @@ -235,9 +235,9 @@ void KMReaderMainWin::slotPrintMsg() void KMReaderMainWin::slotForwardInlineMsg() { KMCommand *command = 0; - if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) { + if ( mReaderWin->message() && mReaderWin->message()->parent() ) { command = new KMForwardInlineCommand( this, mReaderWin->message(), - mReaderWin->message()->tqparent()->identity() ); + mReaderWin->message()->parent()->identity() ); } else { command = new KMForwardInlineCommand( this, mReaderWin->message() ); } @@ -250,9 +250,9 @@ void KMReaderMainWin::slotForwardInlineMsg() void KMReaderMainWin::slotForwardAttachedMsg() { KMCommand *command = 0; - if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) { + if ( mReaderWin->message() && mReaderWin->message()->parent() ) { command = new KMForwardAttachedCommand( this, mReaderWin->message(), - mReaderWin->message()->tqparent()->identity() ); + mReaderWin->message()->parent()->identity() ); } else { command = new KMForwardAttachedCommand( this, mReaderWin->message() ); } @@ -265,9 +265,9 @@ void KMReaderMainWin::slotForwardAttachedMsg() void KMReaderMainWin::slotForwardDigestMsg() { KMCommand *command = 0; - if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) { + if ( mReaderWin->message() && mReaderWin->message()->parent() ) { command = new KMForwardDigestCommand( this, mReaderWin->message(), - mReaderWin->message()->tqparent()->identity() ); + mReaderWin->message()->parent()->identity() ); } else { command = new KMForwardDigestCommand( this, mReaderWin->message() ); } @@ -487,9 +487,9 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo return; } - if ( ! ( aMsg.tqparent() && ( aMsg.tqparent()->isSent() || - aMsg.tqparent()->isDrafts() || - aMsg.tqparent()->isTemplates() ) ) ) { + if ( ! ( aMsg.parent() && ( aMsg.parent()->isSent() || + aMsg.parent()->isDrafts() || + aMsg.parent()->isTemplates() ) ) ) { // add the reply and forward actions only if we are not in a sent-mail, // templates or drafts folder // diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 19f0410a9..342b0fb3f 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -1465,7 +1465,7 @@ void KMReaderWin::displayMessage() { htmlWriter()->begin( mCSSHelper->cssDefinitions( isFixedFont() ) ); htmlWriter()->queue( mCSSHelper->htmlHead( isFixedFont() ) ); - if (!tqparent()) + if (!parent()) setCaption(msg->subject()); removeTempFiles(); @@ -1592,7 +1592,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg) kdDebug(5006) << "\n\n\nKMReaderWin::parseMsg() - special post-encryption handling:\n1." << endl; kdDebug(5006) << "(aMsg == msg) = " << (aMsg == message()) << endl; -kdDebug(5006) << "aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder() = " << (aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder()) << endl; +kdDebug(5006) << "aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() = " << (aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder()) << endl; kdDebug(5006) << "message_was_saved_decrypted_before( aMsg ) = " << message_was_saved_decrypted_before( aMsg ) << endl; kdDebug(5006) << "this->decryptMessage() = " << decryptMessage() << endl; kdDebug(5006) << "otp.hasPendingAsyncJobs() = " << otp.hasPendingAsyncJobs() << endl; @@ -1602,7 +1602,7 @@ kdDebug(5006) << "|| (KMMsgPartiallyEncrypted == encryptionState) = " << (KMMsgP // double click on the message (==not running in a separate window) if( (aMsg == message()) // don't remove encryption in the outbox folder :) - && ( aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder() ) + && ( aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() ) // only proceed if this message was not saved encryptedly before && !message_was_saved_decrypted_before( aMsg ) // only proceed if the message has actually been decrypted @@ -1814,7 +1814,7 @@ void KMReaderWin::slotTouchMessage() message()->encryptionState() != KMMsgEncryptionStateUnknown ) return; - KMFolder *folder = message()->tqparent(); + KMFolder *folder = message()->parent(); if (folder && (folder->isOutbox() || folder->isSent() || folder->isTrash() || folder->isDrafts() || folder->isTemplates() ) ) @@ -1940,7 +1940,7 @@ void KMReaderWin::slotUrlPopup(const TQString &aUrl, const TQPoint& aPos) } } -// Checks if the given node has a tqparent node that is a DIV which has an ID attribute +// Checks if the given node has a parent node that is a DIV which has an ID attribute // with the value specified here static bool hasParentDivWithId( const DOM::Node &start, const TQString &id ) { @@ -1971,7 +1971,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo menu->insertItem(i18n("to view something", "View"), 3); menu->insertItem(SmallIcon("filesaveas"),i18n("Save As..."), 4); menu->insertItem(SmallIcon("editcopy"), i18n("Copy"), 9 ); - const bool canChange = message()->tqparent() ? !message()->tqparent()->isReadOnly() : false; + const bool canChange = message()->parent() ? !message()->parent()->isReadOnly() : false; if ( GlobalSettings::self()->allowAttachmentEditing() && canChange ) menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 ); if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange ) @@ -2084,7 +2084,7 @@ void KMReaderWin::atmViewMsg( KMMessagePart* aMsgPart, int nodeId ) assert(msg != 0); msg->setMsgSerNum( 0 ); // because lookups will fail // some information that is needed for imap messages with LOD - msg->setParent( message()->tqparent() ); + msg->setParent( message()->parent() ); msg->setUID(message()->UID()); msg->setReadyToShow(true); KMReaderMainWin *win = new KMReaderMainWin(); @@ -2476,8 +2476,8 @@ void KMReaderWin::slotUrlClicked() { KMMainWidget *mainWidget = dynamic_cast<KMMainWidget*>(mMainWindow); uint identity = 0; - if ( message() && message()->tqparent() ) { - identity = message()->tqparent()->identity(); + if ( message() && message()->parent() ) { + identity = message()->parent()->identity(); } KMCommand *command = new KMUrlClickedCommand( mClickedUrl, identity, this, diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index 4db8f05d3..7d72cd787 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -86,7 +86,7 @@ class KMReaderWin: public TQWidget, public KMail::Interface::Observer { friend class KMail::KHtmlPartHtmlWriter; public: - KMReaderWin( TQWidget *tqparent, + KMReaderWin( TQWidget *parent, TQWidget *mainWindow, KActionCollection *actionCollection, const char *name=0, diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp index 55df4d5eb..5477f3f64 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -54,10 +54,10 @@ static const int SpecialRuleFieldsCount = // //============================================================================= -KMSearchRuleWidget::KMSearchRuleWidget( TQWidget *tqparent, KMSearchRule *aRule, +KMSearchRuleWidget::KMSearchRuleWidget( TQWidget *parent, KMSearchRule *aRule, const char *name, bool headersOnly, bool absoluteDates ) - : TQWidget( tqparent, name ), + : TQWidget( parent, name ), mRuleField( 0 ), mFunctionStack( 0 ), mValueStack( 0 ), @@ -282,8 +282,8 @@ void KMSearchRuleWidget::slotRuleFieldChanged( const TQString & field ) // //============================================================================= -KMSearchRuleWidgetLister::KMSearchRuleWidgetLister( TQWidget *tqparent, const char* name, bool headersOnly, bool absoluteDates ) - : KWidgetLister( 2, FILTER_MAX_RULES, tqparent, name ) +KMSearchRuleWidgetLister::KMSearchRuleWidgetLister( TQWidget *parent, const char* name, bool headersOnly, bool absoluteDates ) + : KWidgetLister( 2, FILTER_MAX_RULES, parent, name ) { mRuleList = 0; mHeadersOnly = headersOnly; @@ -357,9 +357,9 @@ void KMSearchRuleWidgetLister::reset() slotClear(); } -TQWidget* KMSearchRuleWidgetLister::createWidget( TQWidget *tqparent ) +TQWidget* KMSearchRuleWidgetLister::createWidget( TQWidget *parent ) { - return new KMSearchRuleWidget(tqparent, 0, 0, mHeadersOnly, mAbsoluteDates); + return new KMSearchRuleWidget(parent, 0, 0, mHeadersOnly, mAbsoluteDates); } void KMSearchRuleWidgetLister::clearWidget( TQWidget *aWidget ) @@ -391,15 +391,15 @@ void KMSearchRuleWidgetLister::regenerateRuleListFromWidgets() // //============================================================================= -KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *tqparent, const char *name, bool headersOnly, bool absoluteDates ) - : TQGroupBox( 1/*columns*/, Qt::Horizontal, tqparent, name ) +KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates ) + : TQGroupBox( 1/*columns*/, Qt::Horizontal, parent, name ) { setTitle( i18n("Search Criteria") ); initLayout( headersOnly, absoluteDates ); } -KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *tqparent, const char *name, bool headersOnly, bool absoluteDates) - : TQGroupBox( 1/*column*/, Qt::Horizontal, title, tqparent, name ) +KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates) + : TQGroupBox( 1/*column*/, Qt::Horizontal, title, parent, name ) { initLayout( headersOnly, absoluteDates ); } diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h index 307a7ae2f..e42ae080d 100644 --- a/kmail/kmsearchpatternedit.h +++ b/kmail/kmsearchpatternedit.h @@ -44,7 +44,7 @@ class KMSearchRuleWidget : public TQWidget public: /** Constructor. You can give a KMSearchRule as parameter, which will be used to initialize the widget. */ - KMSearchRuleWidget( TQWidget* tqparent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false ); + KMSearchRuleWidget( TQWidget* parent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false ); enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, tqStatus, Subject, From, To, CC, ReplyTo, Organization }; @@ -111,7 +111,7 @@ class KMSearchRuleWidgetLister : public KWidgetLister friend class ::KMSearchPatternEdit; public: - KMSearchRuleWidgetLister( TQWidget *tqparent=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false ); + KMSearchRuleWidgetLister( TQWidget *parent=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false ); virtual ~KMSearchRuleWidgetLister(); @@ -123,7 +123,7 @@ public slots: protected: virtual void clearWidget( TQWidget *aWidget ); - virtual TQWidget* createWidget( TQWidget *tqparent ); + virtual TQWidget* createWidget( TQWidget *parent ); private: void regenerateRuleListFromWidgets(); @@ -169,12 +169,12 @@ class KMSearchPatternEdit : public TQGroupBox { Q_OBJECT TQ_OBJECT public: - /** Constructor. The tqparent and name parameters are passed to the underlying + /** Constructor. The parent and name parameters are passed to the underlying TQGroupBox, as usual. */ - KMSearchPatternEdit(TQWidget *tqparent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false); + KMSearchPatternEdit(TQWidget *parent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false); /** Constructor. This one allows you to set a title different from i18n("Search Criteria"). */ - KMSearchPatternEdit(const TQString & title, TQWidget *tqparent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false); + KMSearchPatternEdit(const TQString & title, TQWidget *parent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false); ~KMSearchPatternEdit(); /** Set the search pattern. Rules are inserted regardless of the diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 987e4928a..86e931cf9 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -363,9 +363,9 @@ void KMSender::doSendMsg() // Disable the emitting of msgAdded signal, because the message is taken out of the // current folder (outbox) and re-added, to make filter actions changing the message // work. We don't want that to screw up message counts. - if ( mCurrentMsg->tqparent() ) mCurrentMsg->tqparent()->quiet( true ); + if ( mCurrentMsg->parent() ) mCurrentMsg->parent()->quiet( true ); const int processResult = kmkernel->filterMgr()->process(mCurrentMsg,KMFilterMgr::Outbound); - if ( mCurrentMsg->tqparent() ) mCurrentMsg->tqparent()->quiet( false ); + if ( mCurrentMsg->parent() ) mCurrentMsg->parent()->quiet( false ); // 0==processed ok, 1==no filter matched, 2==critical error, abort! switch (processResult) { @@ -401,13 +401,13 @@ void KMSender::doSendMsg() break; } seStatusByLink( mCurrentMsg ); - if (mCurrentMsg->tqparent() && !imapSentFolder) { + if (mCurrentMsg->parent() && !imapSentFolder) { // for speed optimization, this code assumes that mCurrentMsg is the - // last one in it's tqparent folder; make sure that's really the case: - assert( mCurrentMsg->tqparent()->find( mCurrentMsg ) - == mCurrentMsg->tqparent()->count() - 1 ); + // last one in it's parent folder; make sure that's really the case: + assert( mCurrentMsg->parent()->find( mCurrentMsg ) + == mCurrentMsg->parent()->count() - 1 ); // unGet this message: - mCurrentMsg->tqparent()->unGetMsg( mCurrentMsg->tqparent()->count() -1 ); + mCurrentMsg->parent()->unGetMsg( mCurrentMsg->parent()->count() -1 ); } mCurrentMsg = 0; diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index 1c6bc0363..6bd99f991 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -57,8 +57,8 @@ using KMail::AccountManager; * with its count of unread messages, allowing the user to jump * to the first unread message in each folder. */ -KMSystemTray::KMSystemTray(TQWidget *tqparent, const char *name) - : KSystemTray( tqparent, name ), +KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) + : KSystemTray( parent, name ), mParentVisible( true ), mPosOfMainWin( 0, 0 ), mDesktopOfMainWin( 0 ), diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h index 1fa144b65..5e02b15bd 100644 --- a/kmail/kmsystemtray.h +++ b/kmail/kmsystemtray.h @@ -44,7 +44,7 @@ class KMSystemTray : public KSystemTray TQ_OBJECT public: /** construtor */ - KMSystemTray(TQWidget* tqparent=0, const char *name=0); + KMSystemTray(TQWidget* parent=0, const char *name=0); /** destructor */ ~KMSystemTray(); diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index e5afc1c6d..c74c87f89 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -243,9 +243,9 @@ void KMTransportInfo::readPassword() const } -KMTransportSelDlg::KMTransportSelDlg( TQWidget *tqparent, const char *name, +KMTransportSelDlg::KMTransportSelDlg( TQWidget *parent, const char *name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("Add Transport"), Ok|Cancel, Ok ) + : KDialogBase( parent, name, modal, i18n("Add Transport"), Ok|Cancel, Ok ) { TQFrame *page = makeMainWidget(); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); @@ -282,9 +282,9 @@ int KMTransportSelDlg::selected( void ) const KMTransportDialog::KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal ) - : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok, true ), + : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ), mServerTest( 0 ), mTransportInfo( transportInfo ), mAuthNone( AllAuth ), mAuthSSL( AllAuth ), mAuthTLS( AllAuth ) @@ -479,7 +479,7 @@ void KMTransportDialog::makeSmtpPage() "a custom hostname when identifying itself " "to the mail server." "<p>This is useful when your system's hostname " - "may not be set correctly or to tqmask your " + "may not be set correctly or to mask your " "system's true hostname.")); mSmtp.localHostnameLabel = new TQLabel( i18n("Hos&tname:"), page1 ); diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h index 901401e33..ba43ebc01 100644 --- a/kmail/kmtransport.h +++ b/kmail/kmtransport.h @@ -67,7 +67,7 @@ class KMTransportSelDlg : public KDialogBase TQ_OBJECT public: - KMTransportSelDlg( TQWidget *tqparent=0, const char *name=0, bool modal=TRUE ); + KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE ); int selected() const; private slots: @@ -84,7 +84,7 @@ class KMTransportDialog : public KDialogBase public: KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo, - TQWidget *tqparent=0, const char *name=0, bool modal=TRUE ); + TQWidget *parent=0, const char *name=0, bool modal=TRUE ); virtual ~KMTransportDialog(); private slots: diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp index e6726a9a5..29dd8d8b0 100644 --- a/kmail/listjob.cpp +++ b/kmail/listjob.cpp @@ -101,7 +101,7 @@ void ListJob::execute() ImapAccountBase::jobData jd; jd.total = 1; jd.done = 0; jd.cancellable = true; - jd.tqparent = mDestFolder; + jd.parent = mDestFolder; jd.onlySubscribed = ( mType == ImapAccountBase::ListSubscribed || mType == ImapAccountBase::ListSubscribedNoCheck || mType == ImapAccountBase::ListFolderOnlySubscribed ); diff --git a/kmail/listjob.h b/kmail/listjob.h index d12da6bbf..8f4ac73da 100644 --- a/kmail/listjob.h +++ b/kmail/listjob.h @@ -58,13 +58,13 @@ class ListJob : public FolderJob public: /** * Create a new job - * @param storage the tqparent folder, either provide this or a path + * @param storage the parent folder, either provide this or a path * @param account the ImapAccountBase * @param type Type of subscription * @param complete list all folders or only next level * @param path the listing path; * if empty the path of the folder will be taken - * @param item a tqparent ProgressItem + * @param item a parent ProgressItem */ ListJob( ImapAccountBase* account, ImapAccountBase::ListType type, FolderStorage* storage = 0, const TQString& path = TQString(), @@ -97,7 +97,7 @@ public: /** Set this to true for a complete listing */ void setComplete( bool complete ) { mComplete = complete; } - /** Set tqparent progress item */ + /** Set parent progress item */ void setParentProgressItem( KPIM::ProgressItem* it ) { mParentProgressItem = it; } diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp index f3ef1f1e4..ca5f2cc9a 100644 --- a/kmail/localsubscriptiondialog.cpp +++ b/kmail/localsubscriptiondialog.cpp @@ -46,9 +46,9 @@ namespace KMail { -LocalSubscriptionDialog::LocalSubscriptionDialog( TQWidget *tqparent, const TQString &caption, +LocalSubscriptionDialog::LocalSubscriptionDialog( TQWidget *parent, const TQString &caption, ImapAccountBase *acct, TQString startPath ) - : SubscriptionDialog( tqparent, caption, acct, startPath ), + : SubscriptionDialog( parent, caption, acct, startPath ), mAccount( acct ) { } diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h index 685bc5151..d7f3dd0b1 100644 --- a/kmail/localsubscriptiondialog.h +++ b/kmail/localsubscriptiondialog.h @@ -43,7 +43,7 @@ namespace KMail { TQ_OBJECT public: - LocalSubscriptionDialog( TQWidget *tqparent, const TQString &caption, + LocalSubscriptionDialog( TQWidget *parent, const TQString &caption, ImapAccountBase* acct, TQString startPath = TQString() ); virtual ~LocalSubscriptionDialog(); diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp index 9bf4d74d9..ac5959009 100644 --- a/kmail/maildirjob.cpp +++ b/kmail/maildirjob.cpp @@ -64,9 +64,9 @@ MaildirJob::~MaildirJob() } //----------------------------------------------------------------------------- -void MaildirJob::setParentFolder( const KMFolderMaildir* tqparent ) +void MaildirJob::setParentFolder( const KMFolderMaildir* parent ) { - mParentFolder = const_cast<KMFolderMaildir*>( tqparent ); + mParentFolder = const_cast<KMFolderMaildir*>( parent ); } diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h index 0ab122229..d31635cc3 100644 --- a/kmail/maildirjob.h +++ b/kmail/maildirjob.h @@ -48,7 +48,7 @@ public: JobType jt = tGetMessage, KMFolder *folder = 0 ); virtual ~MaildirJob(); - void setParentFolder( const KMFolderMaildir* tqparent ); + void setParentFolder( const KMFolderMaildir* parent ); protected: void execute(); protected slots: diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 7caa9817a..85c0c3408 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -45,8 +45,8 @@ using namespace KMail; -MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* tqparent, KMFolder *folder ) - : KDialogBase( tqparent, "mailinglist_properties", false, i18n( "Mailinglist Folder Properties" ), +MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* parent, KMFolder *folder ) + : KDialogBase( parent, "mailinglist_properties", false, i18n( "Mailinglist Folder Properties" ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ), mFolder( folder ) @@ -199,7 +199,7 @@ void MailingListFolderPropertiesDialog::slotDetectMailingList() /* FIXME Till - make work without the folder tree // first try the currently selected message - KMFolderTree *folderTree = static_cast<KMFolderTree *>( mDlg->tqparent() ); + KMFolderTree *folderTree = static_cast<KMFolderTree *>( mDlg->parent() ); int curMsgIdx = folderTree->mainWidget()->headers()->currentItemIndex(); if ( curMsgIdx > 0 ) { KMMessage *mes = mFolder->getMsg( curMsgIdx ); diff --git a/kmail/mailinglistpropertiesdialog.h b/kmail/mailinglistpropertiesdialog.h index f3aa13fa7..ed7073a65 100644 --- a/kmail/mailinglistpropertiesdialog.h +++ b/kmail/mailinglistpropertiesdialog.h @@ -47,7 +47,7 @@ class MailingListFolderPropertiesDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - MailingListFolderPropertiesDialog( TQWidget *tqparent, KMFolder *folder ); + MailingListFolderPropertiesDialog( TQWidget *parent, KMFolder *folder ); ~MailingListFolderPropertiesDialog() {}; protected: void load(); diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp index 6d5c4e38c..0f0d0536f 100644 --- a/kmail/mailsourceviewer.cpp +++ b/kmail/mailsourceviewer.cpp @@ -53,8 +53,8 @@ int MailSourceHighlighter::highlightParagraph( const TQString& text, int ) { return 0; } -MailSourceViewer::MailSourceViewer( TQWidget *tqparent, const char *name ) - : KTextBrowser( tqparent, name ), mSourceHighLighter( 0 ) +MailSourceViewer::MailSourceViewer( TQWidget *parent, const char *name ) + : KTextBrowser( parent, name ), mSourceHighLighter( 0 ) { setWFlags( WDestructiveClose ); TQAccel *accel = new TQAccel( this, "browser close-accel" ); diff --git a/kmail/mailsourceviewer.h b/kmail/mailsourceviewer.h index d4e60253c..0c29175ba 100644 --- a/kmail/mailsourceviewer.h +++ b/kmail/mailsourceviewer.h @@ -59,7 +59,7 @@ public: class MailSourceViewer : public KTextBrowser { public: - MailSourceViewer( TQWidget *tqparent = 0, const char *name = 0 ); + MailSourceViewer( TQWidget *parent = 0, const char *name = 0 ); ~MailSourceViewer(); void setText( const TQString& text ); private: diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index e306c7772..317429d52 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -29,9 +29,9 @@ inline const TQCheckListItem * qcli_cast( const TQListViewItem * lvi ) { return lvi && lvi->rtti() == 1 ? static_cast<const TQCheckListItem*>( lvi ) : 0 ; } -KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * tqparent, const char * name ) +KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, const char * name ) : KDialogBase( Plain, i18n( "Manage Sieve Scripts" ), Close, Close, - tqparent, name, false ), + parent, name, false ), mSieveEditor( 0 ), mContextMenuItem( 0 ), mWasActive( false ) @@ -126,29 +126,29 @@ void KMail::ManageSieveScriptsDialog::slotRefresh() { } void KMail::ManageSieveScriptsDialog::slotResult( KMail::SieveJob * job, bool success, const TQString &, bool ) { - TQCheckListItem * tqparent = mJobs[job]; - if ( !tqparent ) + TQCheckListItem * parent = mJobs[job]; + if ( !parent ) return; mJobs.remove( job ); - tqparent->setOpen( true ); + parent->setOpen( true ); if ( success ) return; - TQListViewItem * item = new TQListViewItem( tqparent, i18n( "Failed to fetch the list of scripts" ) ); + TQListViewItem * item = new TQListViewItem( parent, i18n( "Failed to fetch the list of scripts" ) ); item->setEnabled( false ); } void KMail::ManageSieveScriptsDialog::slotItem( KMail::SieveJob * job, const TQString & filename, bool isActive ) { - TQCheckListItem * tqparent = mJobs[job]; - if ( !tqparent ) + TQCheckListItem * parent = mJobs[job]; + if ( !parent ) return; - TQCheckListItem * item = new TQCheckListItem( tqparent, filename, TQCheckListItem::RadioButton ); + TQCheckListItem * item = new TQCheckListItem( parent, filename, TQCheckListItem::RadioButton ); if ( isActive ) { item->setOn( true ); - mSelectedItems[tqparent] = item; + mSelectedItems[parent] = item; } } @@ -178,12 +178,12 @@ void KMail::ManageSieveScriptsDialog::slotDeactivateScript() { if ( !mContextMenuItem ) return; - TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() ); - if ( !tqparent ) + TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() ); + if ( !parent ) return; if ( mContextMenuItem->isOn()) { - mSelectedItems[tqparent] = mContextMenuItem; - changeActiveScript( tqparent,false ); + mSelectedItems[parent] = mContextMenuItem; + changeActiveScript( parent,false ); } } @@ -191,12 +191,12 @@ void KMail::ManageSieveScriptsDialog::slotSelectionChanged( TQListViewItem * i ) TQCheckListItem * item = qcli_cast( i ); if ( !item ) return; - TQCheckListItem * tqparent = qcli_cast( item->tqparent() ); - if ( !tqparent ) + TQCheckListItem * parent = qcli_cast( item->parent() ); + if ( !parent ) return; - if ( item->isOn() && mSelectedItems[tqparent] != item ) { - mSelectedItems[tqparent] = item; - changeActiveScript( tqparent,true ); + if ( item->isOn() && mSelectedItems[parent] != item ) { + mSelectedItems[parent] = item; + changeActiveScript( parent,true ); } } @@ -240,14 +240,14 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() { if ( !mContextMenuItem->depth() ) return; - TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() ); - if ( !tqparent ) + TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() ); + if ( !parent ) return; - if ( !mUrls.count( tqparent ) ) + if ( !mUrls.count( parent ) ) return; - KURL u = mUrls[tqparent]; + KURL u = mUrls[parent]; if ( u.isEmpty() ) return; @@ -268,10 +268,10 @@ void KMail::ManageSieveScriptsDialog::slotEditScript() { return; if ( !mContextMenuItem->depth() ) return; - TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() ); - if ( !mUrls.count( tqparent ) ) + TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() ); + if ( !mUrls.count( parent ) ) return; - KURL url = mUrls[tqparent]; + KURL url = mUrls[parent]; if ( url.isEmpty() ) return; url.setFileName( mContextMenuItem->text( 0 ) ); @@ -285,7 +285,7 @@ void KMail::ManageSieveScriptsDialog::slotNewScript() { if ( !mContextMenuItem ) return; if ( mContextMenuItem->depth() ) - mContextMenuItem = qcli_cast( mContextMenuItem->tqparent() ); + mContextMenuItem = qcli_cast( mContextMenuItem->parent() ); if ( !mContextMenuItem ) return; @@ -311,8 +311,8 @@ void KMail::ManageSieveScriptsDialog::slotNewScript() { slotGetResult( 0, true, TQString(), false ); } -KMail::SieveEditor::SieveEditor( TQWidget * tqparent, const char * name ) - : KDialogBase( Plain, i18n( "Edit Sieve Script" ), Ok|Cancel, Ok, tqparent, name ) +KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name ) + : KDialogBase( Plain, i18n( "Edit Sieve Script" ), Ok|Cancel, Ok, parent, name ) { TQVBoxLayout * vlay = new TQVBoxLayout( plainPage(), 0, spacingHint() ); mTextEdit = new TQTextEdit( plainPage() ); diff --git a/kmail/managesievescriptsdialog.h b/kmail/managesievescriptsdialog.h index 73de8465f..048fbcdd2 100644 --- a/kmail/managesievescriptsdialog.h +++ b/kmail/managesievescriptsdialog.h @@ -17,7 +17,7 @@ class ManageSieveScriptsDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - ManageSieveScriptsDialog( TQWidget * tqparent=0, const char * name=0 ); + ManageSieveScriptsDialog( TQWidget * parent=0, const char * name=0 ); ~ManageSieveScriptsDialog(); private slots: diff --git a/kmail/managesievescriptsdialog_p.h b/kmail/managesievescriptsdialog_p.h index c756ebe31..f860ffb52 100644 --- a/kmail/managesievescriptsdialog_p.h +++ b/kmail/managesievescriptsdialog_p.h @@ -12,7 +12,7 @@ class SieveEditor : public KDialogBase { TQ_OBJECT TQ_PROPERTY( TQString script READ script WRITE setScript ) public: - SieveEditor( TQWidget * tqparent=0, const char * name=0 ); + SieveEditor( TQWidget * parent=0, const char * name=0 ); ~SieveEditor(); TQString script() const { return mTextEdit->text(); } diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp index 0d46fe8b3..2205e86f6 100644 --- a/kmail/mboxjob.cpp +++ b/kmail/mboxjob.cpp @@ -72,9 +72,9 @@ MboxJob::execute() //----------------------------------------------------------------------------- void -MboxJob::setParent( const KMFolderMbox *tqparent ) +MboxJob::setParent( const KMFolderMbox *parent ) { - mParent = const_cast<KMFolderMbox*>( tqparent ); + mParent = const_cast<KMFolderMbox*>( parent ); } //----------------------------------------------------------------------------- @@ -82,7 +82,7 @@ void MboxJob::startJob() { KMMessage *msg = mMsgList.first(); - assert( (msg && ( mParent || msg->tqparent() )) ); + assert( (msg && ( mParent || msg->parent() )) ); switch( mType ) { case tGetMessage: { diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h index df9609ae8..656a3928a 100644 --- a/kmail/mboxjob.h +++ b/kmail/mboxjob.h @@ -50,7 +50,7 @@ public: virtual ~MboxJob(); protected: void execute(); - void setParent( const KMFolderMbox *tqparent ); + void setParent( const KMFolderMbox *parent ); protected slots: void startJob(); private: diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index d899972c2..6dc248e7b 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -32,9 +32,9 @@ using namespace KMail; -MessageActions::MessageActions( KActionCollection *ac, TQWidget * tqparent ) : - TQObject( tqparent ), - mParent( tqparent ), +MessageActions::MessageActions( KActionCollection *ac, TQWidget * parent ) : + TQObject( parent ), + mParent( parent ), mActionCollection( ac ), mCurrentMessage( 0 ), mMessageView( 0 ) @@ -139,13 +139,13 @@ void MessageActions::setSelectedVisibleSernums(const TQValueList< TQ_UINT32 > & void MessageActions::updateActions() { bool singleMsg = (mCurrentMessage != 0); - if ( mCurrentMessage && mCurrentMessage->tqparent() ) { - if ( mCurrentMessage->tqparent()->isTemplates() ) + if ( mCurrentMessage && mCurrentMessage->parent() ) { + if ( mCurrentMessage->parent()->isTemplates() ) singleMsg = false; } const bool multiVisible = mVisibleSernums.count() > 0 || mCurrentMessage; const bool flagsAvailable = GlobalSettings::self()->allowLocalFlags() || - !((mCurrentMessage && mCurrentMessage->tqparent()) ? mCurrentMessage->tqparent()->isReadOnly() : true); + !((mCurrentMessage && mCurrentMessage->parent()) ? mCurrentMessage->parent()->isReadOnly() : true); mCreateTodoAction->setEnabled( singleMsg ); mReplyActionMenu->setEnabled( singleMsg ); @@ -262,7 +262,7 @@ void MessageActions::editCurrentMessage() if ( !mCurrentMessage ) return; KMCommand *command = 0; - KMFolder *folder = mCurrentMessage->tqparent(); + KMFolder *folder = mCurrentMessage->parent(); // edit, unlike send again, removes the message from the folder // we only want that for templates and drafts folders if ( folder && ( kmkernel->folderIsDraftOrOutbox( folder ) || diff --git a/kmail/messageactions.h b/kmail/messageactions.h index 0cf062562..a99e555b7 100644 --- a/kmail/messageactions.h +++ b/kmail/messageactions.h @@ -41,7 +41,7 @@ class MessageActions : public TQObject Q_OBJECT TQ_OBJECT public: - MessageActions( KActionCollection* ac, TQWidget *tqparent ); + MessageActions( KActionCollection* ac, TQWidget *parent ); void setMessageView( KMReaderWin *msgView ); void setCurrentMessage( KMMessage *msg ); diff --git a/kmail/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp index 916920168..0257aa0b9 100644 --- a/kmail/messagecopyhelper.cpp +++ b/kmail/messagecopyhelper.cpp @@ -27,8 +27,8 @@ using namespace KMail; using namespace KPIM; MessageCopyHelper::MessageCopyHelper( const TQValueList< TQ_UINT32 > & msgs, - KMFolder * dest, bool move, TQObject * tqparent ) : - TQObject( tqparent ) + KMFolder * dest, bool move, TQObject * parent ) : + TQObject( parent ) { if ( msgs.isEmpty() || !dest ) return; diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h index 1c24d890a..05627e17c 100644 --- a/kmail/messagecopyhelper.h +++ b/kmail/messagecopyhelper.h @@ -48,10 +48,10 @@ class MessageCopyHelper : public TQObject @param msgs List of serial numbers. @param dest Destination folder. @param move If set to true, messages will be moved instead of copied - @param tqparent The tqparent object. + @param parent The parent object. */ MessageCopyHelper( const TQValueList<TQ_UINT32> &msgs, KMFolder *dest, - bool move, TQObject *tqparent = 0 ); + bool move, TQObject *parent = 0 ); /** Converts a MailList into a serial number list. diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp index fa719c534..23ebea559 100644 --- a/kmail/networkaccount.cpp +++ b/kmail/networkaccount.cpp @@ -49,8 +49,8 @@ namespace KMail { // for restricting number of concurrent connections to the same server static TQMap<TQString, int> s_serverConnections; - NetworkAccount::NetworkAccount( AccountManager * tqparent, const TQString & name, uint id ) - : KMAccount( tqparent, name, id ), + NetworkAccount::NetworkAccount( AccountManager * parent, const TQString & name, uint id ) + : KMAccount( parent, name, id ), mSlave( 0 ), mAuth( "*" ), mPort( 0 ), diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h index 891e1edcc..433e30af5 100644 --- a/kmail/networkaccount.h +++ b/kmail/networkaccount.h @@ -47,7 +47,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT protected: - NetworkAccount( AccountManager * tqparent, const TQString & name, uint id ); + NetworkAccount( AccountManager * parent, const TQString & name, uint id ); public: virtual ~NetworkAccount(); diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp index 11a52043b..e6fed27be 100644 --- a/kmail/newfolderdialog.cpp +++ b/kmail/newfolderdialog.cpp @@ -55,8 +55,8 @@ using namespace KMail; -NewFolderDialog::NewFolderDialog( TQWidget* tqparent, KMFolder *folder ) - : KDialogBase( tqparent, "new_folder_dialog", false, i18n( "New Folder" ), +NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder ) + : KDialogBase( parent, "new_folder_dialog", false, i18n( "New Folder" ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ), mFormatComboBox( 0 ), @@ -201,16 +201,16 @@ void NewFolderDialog::slotOk() return; } - // default tqparent is Top Level local folders + // default parent is Top Level local folders KMFolderDir * selectedFolderDir = &(kmkernel->folderMgr()->dir()); - // we got a tqparent, let's use that + // we got a parent, let's use that if ( mFolder ) selectedFolderDir = mFolder->createChildFolder(); // check if the folder already exists if( selectedFolderDir->hasNamedFolder( fldName ) && ( !( mFolder - && ( selectedFolderDir == mFolder->tqparent() ) + && ( selectedFolderDir == mFolder->parent() ) && ( mFolder->storage()->name() == fldName ) ) ) ) { const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).tqarg(fldName); diff --git a/kmail/newfolderdialog.h b/kmail/newfolderdialog.h index e4a01f556..485bf9106 100644 --- a/kmail/newfolderdialog.h +++ b/kmail/newfolderdialog.h @@ -50,7 +50,7 @@ class NewFolderDialog : public KDialogBase TQ_OBJECT public: - NewFolderDialog( TQWidget* tqparent = 0, KMFolder *folder = 0 ); + NewFolderDialog( TQWidget* parent = 0, KMFolder *folder = 0 ); ~NewFolderDialog() {}; TQLabel* mNameLabel; diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index db27f7f59..b3d9c74b3 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -211,7 +211,7 @@ namespace KMail { partNode* parentNode = &startNode; partNode* newNode = new partNode(false, myBody); - // Build the object tree of the new node before setting the tqparent, as otherwise + // Build the object tree of the new node before setting the parent, as otherwise // buildObjectTree() would erronously modify the parents as well newNode->buildObjectTree( false ); diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index e4cb59221..333d14b0d 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -279,7 +279,7 @@ KMMsgEncryptionState partNode::overallEncryptionState() const { KMMsgEncryptionState myState = KMMsgEncryptionStateUnknown; if( mEncryptionState == KMMsgNotEncrypted ) { - // NOTE: tqchildren are tested ONLY when tqparent is not encrypted + // NOTE: tqchildren are tested ONLY when parent is not encrypted if( mChild ) myState = mChild->overallEncryptionState(); else @@ -320,7 +320,7 @@ KMMsgSignatureState partNode::overallSignatureState() const { KMMsgSignatureState myState = KMMsgSignatureStateUnknown; if( mSignatureState == KMMsgNotSigned ) { - // tqchildren are tested ONLY when tqparent is not signed + // tqchildren are tested ONLY when parent is not signed if( mChild ) myState = mChild->overallSignatureState(); else diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 2bdfe3998..04a695a95 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -119,8 +119,8 @@ TQStringList Recipient::allTypeLabels() } -RecipientComboBox::RecipientComboBox( TQWidget *tqparent ) - : TQComboBox( tqparent ) +RecipientComboBox::RecipientComboBox( TQWidget *parent ) + : TQComboBox( parent ) { } @@ -145,8 +145,8 @@ void RecipientLineEdit::keyPressEvent( TQKeyEvent *ev ) } } -RecipientLine::RecipientLine( TQWidget *tqparent ) - : TQWidget( tqparent ), mRecipientsCount( 0 ), mModified( false ) +RecipientLine::RecipientLine( TQWidget *parent ) + : TQWidget( parent ), mRecipientsCount( 0 ), mModified( false ) { TQBoxLayout *topLayout = new TQHBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -320,8 +320,8 @@ void RecipientLine::setRemoveLineButtonEnabled( bool b ) // ------------ RecipientsView --------------------- -RecipientsView::RecipientsView( TQWidget *tqparent ) - : TQScrollView( tqparent ), mCurDelLine( 0 ), +RecipientsView::RecipientsView( TQWidget *parent ) + : TQScrollView( parent ), mCurDelLine( 0 ), mLineHeight( 0 ), mFirstColumnWidth( 0 ), mModified( false ) { @@ -698,8 +698,8 @@ void RecipientsView::moveCompletionPopup() } -RecipientsToolTip::RecipientsToolTip( RecipientsView *view, TQWidget *tqparent ) - : TQToolTip( tqparent ), mView( view ) +RecipientsToolTip::RecipientsToolTip( RecipientsView *view, TQWidget *parent ) + : TQToolTip( parent ), mView( view ) { } @@ -748,8 +748,8 @@ void RecipientsToolTip::maybeTip( const TQPoint & p ) } -SideWidget::SideWidget( RecipientsView *view, TQWidget *tqparent ) - : TQWidget( tqparent ), mView( view ), mRecipientPicker( 0 ) +SideWidget::SideWidget( RecipientsView *view, TQWidget *parent ) + : TQWidget( parent ), mView( view ), mRecipientPicker( 0 ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -837,8 +837,8 @@ void SideWidget::pickRecipient() } -RecipientsEditor::RecipientsEditor( TQWidget *tqparent ) - : TQWidget( tqparent ), mModified( false ) +RecipientsEditor::RecipientsEditor( TQWidget *parent ) + : TQWidget( parent ), mModified( false ) { TQBoxLayout *topLayout = new TQHBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h index 7bd9d13b8..0c4aafbcf 100644 --- a/kmail/recipientseditor.h +++ b/kmail/recipientseditor.h @@ -74,7 +74,7 @@ class RecipientComboBox : public TQComboBox Q_OBJECT TQ_OBJECT public: - RecipientComboBox( TQWidget *tqparent ); + RecipientComboBox( TQWidget *parent ); signals: void rightPressed(); @@ -88,8 +88,8 @@ class RecipientLineEdit : public KMLineEdit Q_OBJECT TQ_OBJECT public: - RecipientLineEdit( TQWidget * tqparent ) : - KMLineEdit( true, tqparent ) {} + RecipientLineEdit( TQWidget * parent ) : + KMLineEdit( true, parent ) {} signals: void deleteMe(); @@ -105,7 +105,7 @@ class RecipientLine : public TQWidget Q_OBJECT TQ_OBJECT public: - RecipientLine( TQWidget *tqparent ); + RecipientLine( TQWidget *parent ); void setRecipient( const Recipient & ); Recipient recipient() const; @@ -175,7 +175,7 @@ class RecipientsView : public TQScrollView Q_OBJECT TQ_OBJECT public: - RecipientsView( TQWidget *tqparent ); + RecipientsView( TQWidget *parent ); TQSize tqminimumSizeHint() const; TQSize tqsizeHint() const; @@ -253,7 +253,7 @@ class RecipientsView : public TQScrollView class RecipientsToolTip : public TQToolTip { public: - RecipientsToolTip( RecipientsView *, TQWidget *tqparent ); + RecipientsToolTip( RecipientsView *, TQWidget *parent ); protected: void maybeTip( const TQPoint & p ); @@ -269,7 +269,7 @@ class SideWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - SideWidget( RecipientsView *view, TQWidget *tqparent ); + SideWidget( RecipientsView *view, TQWidget *parent ); ~SideWidget(); RecipientsPicker* picker() const; @@ -301,7 +301,7 @@ class RecipientsEditor : public TQWidget Q_OBJECT TQ_OBJECT public: - RecipientsEditor( TQWidget *tqparent ); + RecipientsEditor( TQWidget *parent ); ~RecipientsEditor(); void clear(); diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp index 8ef12ed24..05e552530 100644 --- a/kmail/recipientseditortest.cpp +++ b/kmail/recipientseditortest.cpp @@ -39,8 +39,8 @@ #include <tqlineedit.h> #include <tqtextedit.h> -Composer::Composer( TQWidget *tqparent ) - : TQWidget( tqparent ) +Composer::Composer( TQWidget *parent ) + : TQWidget( parent ) { TQGridLayout *topLayout = new TQGridLayout( this ); topLayout->setMargin( 4 ); diff --git a/kmail/recipientseditortest.h b/kmail/recipientseditortest.h index ea2f1e9ef..77387218a 100644 --- a/kmail/recipientseditortest.h +++ b/kmail/recipientseditortest.h @@ -33,7 +33,7 @@ class Composer : public TQWidget Q_OBJECT TQ_OBJECT public: - Composer( TQWidget *tqparent ); + Composer( TQWidget *parent ); public slots: void slotClose(); diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 11b2cec6f..097cedd0b 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -227,9 +227,9 @@ RecipientItem *RecipientViewItem::recipientItem() const } -RecipientsListToolTip::RecipientsListToolTip( TQWidget *tqparent, +RecipientsListToolTip::RecipientsListToolTip( TQWidget *parent, KListView *listView ) - : TQToolTip( tqparent ) + : TQToolTip( parent ) { mListView = listView; } @@ -327,8 +327,8 @@ TQString RecipientsCollection::id() const return mId; } -SearchLine::SearchLine( TQWidget *tqparent, KListView *listView ) - : KListViewSearchLine( tqparent, listView ) +SearchLine::SearchLine( TQWidget *parent, KListView *listView ) + : KListViewSearchLine( parent, listView ) { } @@ -340,8 +340,8 @@ void SearchLine::keyPressEvent( TQKeyEvent *ev ) } -RecipientsPicker::RecipientsPicker( TQWidget *tqparent ) - : TQDialog( tqparent, "RecipientsPicker" ) +RecipientsPicker::RecipientsPicker( TQWidget *parent ) + : TQDialog( parent, "RecipientsPicker" ) #ifndef KDEPIM_NEW_DISTRLISTS , mDistributionListManager( 0 ) #endif diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h index 9f989275c..6e3d7998e 100644 --- a/kmail/recipientspicker.h +++ b/kmail/recipientspicker.h @@ -117,7 +117,7 @@ class RecipientViewItem : public KListViewItem class RecipientsListToolTip : public TQToolTip { public: - RecipientsListToolTip( TQWidget *tqparent, KListView * ); + RecipientsListToolTip( TQWidget *parent, KListView * ); protected: void maybeTip( const TQPoint &pos ); @@ -165,7 +165,7 @@ class SearchLine : public KListViewSearchLine Q_OBJECT TQ_OBJECT public: - SearchLine( TQWidget *tqparent, KListView *listView ); + SearchLine( TQWidget *parent, KListView *listView ); signals: void downPressed(); @@ -181,7 +181,7 @@ class RecipientsPicker : public TQDialog Q_OBJECT TQ_OBJECT public: - RecipientsPicker( TQWidget *tqparent ); + RecipientsPicker( TQWidget *parent ); ~RecipientsPicker(); void setRecipients( const Recipient::List & ); diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index 7a3507efc..4027375b9 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -52,9 +52,9 @@ using KRecentAddress::RecentAddresses; using namespace KMail; -RedirectDialog::RedirectDialog( TQWidget *tqparent, const char *name, +RedirectDialog::RedirectDialog( TQWidget *parent, const char *name, bool modal, bool immediate ) - : KDialogBase( tqparent, name, modal, i18n( "Redirect Message" ), + : KDialogBase( parent, name, modal, i18n( "Redirect Message" ), User1|User2|Cancel, ( immediate ? User1 : User2 ), false ) { TQVBox *vbox = makeVBoxMainWidget(); diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h index d849b7a21..c34803131 100644 --- a/kmail/redirectdialog.h +++ b/kmail/redirectdialog.h @@ -54,13 +54,13 @@ namespace KMail { public: /** Constructor - @param tqparent tqparent TQWidget + @param parent parent TQWidget @param name dialog name @param modal dialog modal type @param immediate True, if the Send Now button should be default or false if the Queue button should be default */ - RedirectDialog( TQWidget *tqparent=0, const char *name=0, + RedirectDialog( TQWidget *parent=0, const char *name=0, bool modal=false, bool immediate=true ); /** Return the addresses for the redirection */ diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp index 1d4d3b992..0b2b2fb50 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -49,8 +49,8 @@ namespace KMail { - RegExpLineEdit::RegExpLineEdit( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), + RegExpLineEdit::RegExpLineEdit( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mLineEdit( 0 ), mRegExpEditButton( 0 ), mRegExpEditDialog( 0 ) @@ -58,9 +58,9 @@ namespace KMail { initWidget(); } - RegExpLineEdit::RegExpLineEdit( const TQString &str, TQWidget *tqparent, + RegExpLineEdit::RegExpLineEdit( const TQString &str, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ), + : TQWidget( parent, name ), mLineEdit( 0 ), mRegExpEditButton( 0 ), mRegExpEditDialog( 0 ) diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h index 65a1b731c..2cfeaa4a8 100644 --- a/kmail/regexplineedit.h +++ b/kmail/regexplineedit.h @@ -50,9 +50,9 @@ namespace KMail { TQ_OBJECT public: - RegExpLineEdit( const TQString &str, TQWidget *tqparent = 0, + RegExpLineEdit( const TQString &str, TQWidget *parent = 0, const char *name = 0 ); - RegExpLineEdit( TQWidget *tqparent = 0, const char *name = 0 ); + RegExpLineEdit( TQWidget *parent = 0, const char *name = 0 ); TQString text() const; diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index 8f69e6f62..ed8aa5cb7 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -96,7 +96,7 @@ void RenameJob::execute() { if ( mNewParent ) { - // move the folder to a different tqparent + // move the folder to a different parent KMFolderType type = mStorage->folderType(); if ( ( type == KMFolderTypeMbox || type == KMFolderTypeMaildir ) && mNewParent->type() == KMStandardDir && diff --git a/kmail/renamejob.h b/kmail/renamejob.h index 7e968ec33..9389fc0c1 100644 --- a/kmail/renamejob.h +++ b/kmail/renamejob.h @@ -57,7 +57,7 @@ public: * Create a new job * @param storage the folder that should be renames * @param newName the new name of the folder - * @param newParent the new tqparent if the folder should be moved, else 0 + * @param newParent the new parent if the folder should be moved, else 0 */ RenameJob( FolderStorage* storage, const TQString& newName, KMFolderDir* newParent = 0 ); diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index 42ef1ca4c..9cc9e3ecb 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -228,12 +228,12 @@ void KMail::RuleWidgetHandlerManager::unregisterHandler( const RuleWidgetHandler } namespace { - /** Returns the number of immediate tqchildren of tqparent with the given object + /** Returns the number of immediate tqchildren of parent with the given object name. Used by RuleWidgetHandlerManager::createWidgets(). */ - int childCount( const TQObject *tqparent, const char *objName ) + int childCount( const TQObject *parent, const char *objName ) { - TQObjectList *list = tqparent->queryList( 0, objName, false, false ); + TQObjectList *list = parent->queryList( 0, objName, false, false ); if ( !list ) return 0; const int count = list->count(); @@ -357,10 +357,10 @@ namespace { // This is a simplified and constified copy of TQObject::child(). According // to a comment in tqobject.h TQObject::child() will be made const in TQt 4.0. // So once we require TQt 4.0 this can be removed. - TQObject* TQObject_child_const( const TQObject *tqparent, + TQObject* TQObject_child_const( const TQObject *parent, const char *objName ) { - const TQObjectList list = tqparent->childrenListObject(); + const TQObjectList list = parent->childrenListObject(); if ( list.isEmpty() ) return 0; diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 6250d761d..8714109c3 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -71,8 +71,8 @@ const int SearchWindow::MSGID_COLUMN = 4; class MatchListView : public KListView { public: - MatchListView( TQWidget *tqparent, SearchWindow* sw, const char* name = 0 ) : - KListView( tqparent, name ), + MatchListView( TQWidget *parent, SearchWindow* sw, const char* name = 0 ) : + KListView( parent, name ), mSearchWindow( sw ) {} @@ -562,7 +562,7 @@ void SearchWindow::slotAddMsg(int idx) bool unget = !mFolder->isMessage(idx); KMMessage *msg = mFolder->getMsg(idx); TQString from, fName; - KMFolder *pFolder = msg->tqparent(); + KMFolder *pFolder = msg->parent(); if (!mFolders.contains(pFolder)) { mFolders.append(pFolder); pFolder->open("searchwindow"); diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h index f8da35d77..6ea4adf86 100644 --- a/kmail/searchwindow.h +++ b/kmail/searchwindow.h @@ -73,13 +73,13 @@ class SearchWindow: public KDialogBase, virtual public KXMLGUIClient public: /** * Creates a new search window. - * @param tqparent The tqparent widget. + * @param parent The parent widget. * @param name The (widget) name of the dialog. * @param curFolder The folder which will be pre-selected as the base folder * of search operations. * @param modal Whether the dialog is to be shown modal. */ - SearchWindow( KMMainWidget* tqparent, const char* name=0, + SearchWindow( KMMainWidget* parent, const char* name=0, KMFolder *curFolder=0, bool modal=false ); virtual ~SearchWindow(); diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp index e9d1fe969..9c22539c2 100644 --- a/kmail/sieveconfig.cpp +++ b/kmail/sieveconfig.cpp @@ -53,8 +53,8 @@ namespace KMail { config.writeEntry( "sieve-vacation-filename", mVacationFileName ); } - SieveConfigEditor::SieveConfigEditor( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ) + SieveConfigEditor::SieveConfigEditor( TQWidget * parent, const char * name ) + : TQWidget( parent, name ) { // tmp. vars: int row = -1; diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h index d426b998c..2765f6a59 100644 --- a/kmail/sieveconfig.h +++ b/kmail/sieveconfig.h @@ -89,7 +89,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT public: - SieveConfigEditor( TQWidget * tqparent=0, const char * name=0 ); + SieveConfigEditor( TQWidget * parent=0, const char * name=0 ); bool managesieveSupported() const; virtual void setManagesieveSupported( bool enable ); diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp index 75d07495d..1d33e2aac 100644 --- a/kmail/sievedebugdialog.cpp +++ b/kmail/sievedebugdialog.cpp @@ -186,8 +186,8 @@ private: namespace KMail { -SieveDebugDialog::SieveDebugDialog( TQWidget *tqparent, const char *name ) -: KDialogBase( tqparent, name, true, i18n( "Sieve Diagnostics" ), KDialogBase::Ok, +SieveDebugDialog::SieveDebugDialog( TQWidget *parent, const char *name ) +: KDialogBase( parent, name, true, i18n( "Sieve Diagnostics" ), KDialogBase::Ok, KDialogBase::Ok, true ), mSieveJob( 0 ) { diff --git a/kmail/sievedebugdialog.h b/kmail/sievedebugdialog.h index 6457280bc..669a13d54 100644 --- a/kmail/sievedebugdialog.h +++ b/kmail/sievedebugdialog.h @@ -53,7 +53,7 @@ class SieveDebugDialog : public KDialogBase TQ_OBJECT public: - SieveDebugDialog( TQWidget *tqparent = 0, const char *name = 0 ); + SieveDebugDialog( TQWidget *parent = 0, const char *name = 0 ); virtual ~SieveDebugDialog(); protected: diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp index 23517b533..6993f8f66 100644 --- a/kmail/sievejob.cpp +++ b/kmail/sievejob.cpp @@ -34,8 +34,8 @@ namespace KMail { SieveJob::SieveJob( const KURL & url, const TQString & script, const TQValueStack<Command> & commands, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), mUrl( url ), mJob( 0 ), mDec( 0 ), mScript( script ), mFileExists( DontKnow ), mCommands( commands ), mShowProgressInfo(true) @@ -47,8 +47,8 @@ namespace KMail { SieveJob::SieveJob( const KURL & url, const TQString & script, const TQValueStack<Command> & commands, bool showProgressInfo, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), mUrl( url ), mJob( 0 ), mDec( 0 ), mScript( script ), mFileExists( DontKnow ), mCommands( commands ), mShowProgressInfo(showProgressInfo) diff --git a/kmail/sievejob.h b/kmail/sievejob.h index b2ec73d0a..ddf3e6a91 100644 --- a/kmail/sievejob.h +++ b/kmail/sievejob.h @@ -38,11 +38,11 @@ namespace KMail { enum Command { Get, Put, Activate, Deactivate, SearchActive, List, Delete }; SieveJob( const KURL & url, const TQString & script, const TQValueStack<Command> & commands, - TQObject * tqparent=0, const char * name=0 ); + TQObject * parent=0, const char * name=0 ); SieveJob( const KURL & url, const TQString & script, const TQValueStack<Command> & commands, bool showProgressInfo, - TQObject * tqparent=0, const char * name=0 ); + TQObject * parent=0, const char * name=0 ); virtual ~SieveJob(); public: diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index 7785b45f1..fb3c7c40d 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -42,8 +42,8 @@ using namespace KMail; namespace KMail { - SignatureConfigurator::SignatureConfigurator( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ) + SignatureConfigurator::SignatureConfigurator( TQWidget * parent, const char * name ) + : TQWidget( parent, name ) { // tmp. vars: TQLabel * label; diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h index e9f0fdf0a..2d46ac5db 100644 --- a/kmail/signatureconfigurator.h +++ b/kmail/signatureconfigurator.h @@ -35,7 +35,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT public: - SignatureConfigurator( TQWidget * tqparent=0, const char * name=0 ); + SignatureConfigurator( TQWidget * parent=0, const char * name=0 ); virtual ~SignatureConfigurator(); bool isSignatureEnabled() const; diff --git a/kmail/simplefoldertree.h b/kmail/simplefoldertree.h index 00632fbde..6bfc3eb33 100644 --- a/kmail/simplefoldertree.h +++ b/kmail/simplefoldertree.h @@ -133,9 +133,9 @@ template <class T> class SimpleFolderTreeBase : public TreeBase public: - inline SimpleFolderTreeBase( TQWidget * tqparent, KMFolderTree *folderTree, + inline SimpleFolderTreeBase( TQWidget * parent, KMFolderTree *folderTree, const TQString &preSelection, bool mustBeReadWrite ) - : TreeBase( tqparent, folderTree, preSelection, mustBeReadWrite ) + : TreeBase( parent, folderTree, preSelection, mustBeReadWrite ) { assert( folderTree ); setFolderColumn( addColumn( i18n( "Folder" ) ) ); @@ -148,24 +148,24 @@ template <class T> class SimpleFolderTreeBase : public TreeBase } - virtual SimpleFolderTreeItem<T>* createItem( TQListView * tqparent ) + virtual SimpleFolderTreeItem<T>* createItem( TQListView * parent ) { - return new SimpleFolderTreeItem<T>( tqparent ); + return new SimpleFolderTreeItem<T>( parent ); } - virtual SimpleFolderTreeItem<T>* createItem( TQListView * tqparent, TQListViewItem* afterListViewItem ) + virtual SimpleFolderTreeItem<T>* createItem( TQListView * parent, TQListViewItem* afterListViewItem ) { - return new SimpleFolderTreeItem<T>( tqparent, afterListViewItem ); + return new SimpleFolderTreeItem<T>( parent, afterListViewItem ); } - virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * tqparent, TQListViewItem* afterListViewItem ) + virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * parent, TQListViewItem* afterListViewItem ) { - return new SimpleFolderTreeItem<T>( tqparent, afterListViewItem ); + return new SimpleFolderTreeItem<T>( parent, afterListViewItem ); } - virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * tqparent ) + virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * parent ) { - return new SimpleFolderTreeItem<T>( tqparent ); + return new SimpleFolderTreeItem<T>( parent ); } inline void keyPressEvent( TQKeyEvent *e ) diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp index 4ab24f69a..8520af848 100644 --- a/kmail/simplestringlisteditor.cpp +++ b/kmail/simplestringlisteditor.cpp @@ -56,14 +56,14 @@ static inline TQListBoxItem * findSelectedItem( TQListBox * lb ) { return item; } -SimpleStringListEditor::SimpleStringListEditor( TQWidget * tqparent, +SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, const char * name, ButtonCode buttons, const TQString & addLabel, const TQString & removeLabel, const TQString & modifyLabel, const TQString & addDialogLabel ) - : TQWidget( tqparent, name ), + : TQWidget( parent, name ), mAddButton(0), mRemoveButton(0), mModifyButton(0), mUpButton(0), mDownButton(0), mAddDialogLabel( addDialogLabel.isEmpty() ? diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h index edcd2a7c2..49169f7a6 100644 --- a/kmail/simplestringlisteditor.h +++ b/kmail/simplestringlisteditor.h @@ -58,7 +58,7 @@ public: }; /** Constructor. Populates the list with @p strings. */ - SimpleStringListEditor( TQWidget * tqparent=0, const char * name=0, + SimpleStringListEditor( TQWidget * parent=0, const char * name=0, ButtonCode buttons=Unsorted, const TQString & addLabel=TQString(), const TQString & removeLabel=TQString(), diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 2229a7633..25a64ae65 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -26,14 +26,14 @@ #include "kmessagebox.h" /* - * Constructs a SnippetDlg as a child of 'tqparent', with the + * Constructs a SnippetDlg as a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : SnippetDlgBase( tqparent, name, modal, fl ), actionCollection( ac ) +SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac ) { if ( !name ) setName( "SnippetDlg" ); diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h index e6ac0511d..6aa62d0fa 100644 --- a/kmail/snippetdlg.h +++ b/kmail/snippetdlg.h @@ -22,7 +22,7 @@ class SnippetDlg : public SnippetDlgBase TQ_OBJECT public: - SnippetDlg( KActionCollection* ac, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SnippetDlg( KActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SnippetDlg(); void setShowShortcut( bool show ); diff --git a/kmail/snippetitem.cpp b/kmail/snippetitem.cpp index 9d835d639..f9f3aa871 100644 --- a/kmail/snippetitem.cpp +++ b/kmail/snippetitem.cpp @@ -17,8 +17,8 @@ #include <tqstring.h> -SnippetItem::SnippetItem(TQListView * tqparent, TQString name, TQString text ) - : TQListViewItem( tqparent, name ), action(0) +SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text ) + : TQListViewItem( parent, name ), action(0) { strName = name; strText = text; @@ -26,12 +26,12 @@ SnippetItem::SnippetItem(TQListView * tqparent, TQString name, TQString text ) setOpen( true ); } -SnippetItem::SnippetItem(TQListViewItem * tqparent, TQString name, TQString text) - : TQListViewItem( tqparent, name ), action(0) +SnippetItem::SnippetItem(TQListViewItem * parent, TQString name, TQString text) + : TQListViewItem( parent, name ), action(0) { strName = name; strText = text; - iParent = ((SnippetGroup *)tqparent)->getId(); + iParent = ((SnippetGroup *)parent)->getId(); setOpen( true ); } @@ -81,7 +81,7 @@ void SnippetItem::setName(TQString name) void SnippetItem::resetParent() { - SnippetGroup * group = dynamic_cast<SnippetGroup*>(tqparent()); + SnippetGroup * group = dynamic_cast<SnippetGroup*>(parent()); if (group) iParent = group->getId(); } @@ -129,8 +129,8 @@ Deklaration for class SnippetGroup int SnippetGroup::iMaxId = 1; -SnippetGroup::SnippetGroup(TQListView * tqparent, TQString name, int id) - : SnippetItem(tqparent, name, i18n("GROUP")) +SnippetGroup::SnippetGroup(TQListView * parent, TQString name, int id) + : SnippetItem(parent, name, i18n("GROUP")) { if (id > 0) { iId = id; diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h index 2ddc609f8..f15fb07d6 100644 --- a/kmail/snippetitem.h +++ b/kmail/snippetitem.h @@ -35,12 +35,12 @@ friend class SnippetGroup; Q_OBJECT TQ_OBJECT public: - SnippetItem(TQListViewItem * tqparent, TQString name, TQString text); + SnippetItem(TQListViewItem * parent, TQString name, TQString text); ~SnippetItem(); TQString getName(); TQString getText(); - using TQListViewItem::tqparent; + using TQListViewItem::parent; int getParent() { return iParent; } void resetParent(); void setText(TQString text); @@ -55,7 +55,7 @@ public slots: void slotExecute(); private: - SnippetItem(TQListView * tqparent, TQString name, TQString text); + SnippetItem(TQListView * parent, TQString name, TQString text); TQString strName; TQString strText; int iParent; @@ -70,7 +70,7 @@ it in the main TQPtrList<SnippetItem>. */ class SnippetGroup : public SnippetItem { public: - SnippetGroup(TQListView * tqparent, TQString name, int id); + SnippetGroup(TQListView * parent, TQString name, int id); ~SnippetGroup(); int getId() { return iId; } diff --git a/kmail/snippetsettings.cpp b/kmail/snippetsettings.cpp index 8dce0d31c..e61ebf43c 100644 --- a/kmail/snippetsettings.cpp +++ b/kmail/snippetsettings.cpp @@ -20,14 +20,14 @@ #include "snippetwidget.h" -SnippetSettings::SnippetSettings(TQWidget *tqparent, const char *name) - : SnippetSettingsBase(tqparent, name) +SnippetSettings::SnippetSettings(TQWidget *parent, const char *name) + : SnippetSettingsBase(parent, name) { _widget = NULL; } -SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *tqparent, const char *name) - : SnippetSettingsBase(tqparent, name) +SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *parent, const char *name) + : SnippetSettingsBase(parent, name) { _cfg = w->getSnippetConfig(); _widget = w; diff --git a/kmail/snippetsettings.h b/kmail/snippetsettings.h index 05ce99a56..ca0eccc80 100644 --- a/kmail/snippetsettings.h +++ b/kmail/snippetsettings.h @@ -31,8 +31,8 @@ class SnippetSettings : public SnippetSettingsBase Q_OBJECT TQ_OBJECT public: - SnippetSettings(TQWidget *tqparent = 0, const char *name = 0); - SnippetSettings(SnippetWidget * w, TQWidget *tqparent = 0, const char *name = 0); + SnippetSettings(TQWidget *parent = 0, const char *name = 0); + SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0); ~SnippetSettings(); diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 4dba053ed..920434aa7 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -44,8 +44,8 @@ #include <cassert> -SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* tqparent) - : KListView(tqparent, "snippet widget"), TQToolTip( viewport() ), +SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent) + : KListView(parent, "snippet widget"), TQToolTip( viewport() ), mEditor( editor ), mActionCollection( actionCollection ) { // init the TQPtrList @@ -85,7 +85,7 @@ SnippetWidget::~SnippetWidget() writeConfig(); delete _cfg; - /* We need to delete the child items before the tqparent items + /* We need to delete the child items before the parent items otherwise KDevelop would crash on exiting */ SnippetItem * item; while (_list.count() > 0) { @@ -111,7 +111,7 @@ void SnippetWidget::slotAdd() which the selected item is a child of*/ SnippetGroup * group = dynamic_cast<SnippetGroup*>(selectedItem()); if ( !group && selectedItem() ) - group = dynamic_cast<SnippetGroup*>(selectedItem()->tqparent()); + group = dynamic_cast<SnippetGroup*>(selectedItem()->parent()); /* still no group, let's make a default one */ if (!group ) { @@ -139,12 +139,12 @@ void SnippetWidget::slotAdd() } /*! - \fn SnippetWidget::makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text ) + \fn SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text ) Helper factory method. */ -SnippetItem* SnippetWidget::makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text, const KShortcut& shortcut ) +SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut ) { - SnippetItem * item = new SnippetItem(tqparent, name, text); + SnippetItem * item = new SnippetItem(parent, name, text); const TQString actionName = i18n("Snippet %1").tqarg(name); const TQString normalizedName = TQString(actionName).replace(" ", "_"); if ( !mActionCollection->action(normalizedName.utf8().data() ) ) { @@ -255,10 +255,10 @@ void SnippetWidget::slotEdit( TQListViewItem* item ) pSnippet->setText( dlg.snippetText->text() ); pSnippet->getAction()->setShortcut( dlg.keyButton->shortcut()); - /* if the user changed the tqparent we need to move the snippet */ + /* if the user changed the parent we need to move the snippet */ if ( SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName() != dlg.cbGroup->currentText() ) { SnippetGroup * newGroup = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list)); - pSnippet->tqparent()->takeItem(pSnippet); + pSnippet->parent()->takeItem(pSnippet); newGroup->insertItem(pSnippet); pSnippet->resetParent(); } @@ -909,7 +909,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *) SnippetGroup *group = dynamic_cast<SnippetGroup *>(item2); if (!group) - group = dynamic_cast<SnippetGroup *>(item2->tqparent()); + group = dynamic_cast<SnippetGroup *>(item2->parent()); TQCString dropped; TQByteArray data = e->tqencodedData("text/plain"); diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h index bc45d6d48..a55b91e09 100644 --- a/kmail/snippetwidget.h +++ b/kmail/snippetwidget.h @@ -48,7 +48,7 @@ class SnippetWidget : public KListView, public TQToolTip TQ_OBJECT public: - SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* tqparent = 0); + SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent = 0); ~SnippetWidget(); TQPtrList<SnippetItem> * getList() { return (&_list); } void writeConfig(); @@ -68,7 +68,7 @@ private: bool showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQString, TQString> * mapSave, int & iWidth, int & iBasicHeight, int & iOneHeight); TQString showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize); - SnippetItem* makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text, const KShortcut& shortcut ); + SnippetItem* makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut ); TQPtrList<SnippetItem> _list; TQMap<TQString, TQString> _mapSaved; diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index 49ece85dd..5b9fbf7ee 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -45,9 +45,9 @@ namespace KMail { -SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *tqparent, const TQString &caption, +SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *parent, const TQString &caption, KAccount *acct, TQString startPath ) - : KSubscription( tqparent, caption, acct, User1, TQString(), false ), + : KSubscription( parent, caption, acct, User1, TQString(), false ), mStartPath( startPath ), mSubscribed( false ), mForceSubscriptionEnable( false) { // hide unneeded checkboxes @@ -111,18 +111,18 @@ void SubscriptionDialogBase::moveChildrenToNewParent( GroupItem *oldItem, GroupI void SubscriptionDialogBase::createListViewItem( int i ) { GroupItem *item = 0; - GroupItem *tqparent = 0; + GroupItem *parent = 0; - // get the tqparent + // get the parent GroupItem *oldItem = 0; TQString parentPath; - findParentItem( mFolderNames[i], mFolderPaths[i], parentPath, &tqparent, &oldItem ); + findParentItem( mFolderNames[i], mFolderPaths[i], parentPath, &parent, &oldItem ); - if (!tqparent && parentPath != "/") + if (!parent && parentPath != "/") { - // the tqparent is not available and it's no root-item + // the parent 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 + // so we create each parent in advance TQStringList folders = TQStringList::split(mDelimiter, parentPath); uint i = 0; for ( TQStringList::Iterator it = folders.begin(); it != folders.end(); ++it ) @@ -154,17 +154,17 @@ void SubscriptionDialogBase::createListViewItem( int i ) // as these items are "dummies" we create them non-checkable if (!item) { - if (tqparent) - item = new GroupItem(tqparent, info, this, false); + if (parent) + item = new GroupItem(parent, info, this, false); else item = new GroupItem(folderTree(), info, this, false); mItemDict.insert(info.path, item); } - tqparent = item; + parent = item; ++i; } // folders - } // tqparent + } // parent KGroupInfo info(mFolderNames[i]); if (mFolderNames[i].upper() == "INBOX" && @@ -175,8 +175,8 @@ void SubscriptionDialogBase::createListViewItem( int i ) // only checkable when the folder is selectable bool checkable = ( mFolderMimeTypes[i] == "inode/directory" ) ? false : true; // create a new item - if (tqparent) - item = new GroupItem(tqparent, info, this, checkable); + if (parent) + item = new GroupItem(parent, info, this, checkable); else item = new GroupItem(folderTree(), info, this, checkable); @@ -199,17 +199,17 @@ void SubscriptionDialogBase::createListViewItem( int i ) //------------------------------------------------------------------------------ void SubscriptionDialogBase::findParentItem( TQString &name, TQString &path, TQString &parentPath, - GroupItem **tqparent, GroupItem **oldItem ) + GroupItem **parent, GroupItem **oldItem ) { - // remove the name (and the separator) from the path to get the tqparent path + // remove the name (and the separator) from the path to get the parent path int start = path.length() - (name.length()+2); int length = name.length()+1; if (start < 0) start = 0; parentPath = path; parentPath.remove(start, length); - // find the tqparent by it's path - *tqparent = mItemDict[parentPath]; + // find the parent by it's path + *parent = mItemDict[parentPath]; // check if the item already exists *oldItem = mItemDict[path]; @@ -303,9 +303,9 @@ void SubscriptionDialogBase::loadingComplete() // implementation for server side subscription //------------------------------------------------------------------------------ -SubscriptionDialog::SubscriptionDialog( TQWidget *tqparent, const TQString &caption, +SubscriptionDialog::SubscriptionDialog( TQWidget *parent, const TQString &caption, KAccount *acct, TQString startPath ) - : SubscriptionDialogBase( tqparent, caption, acct, startPath ) + : SubscriptionDialogBase( parent, caption, acct, startPath ) { } diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h index 4d3a01db7..9d16c9e22 100644 --- a/kmail/subscriptiondialog.h +++ b/kmail/subscriptiondialog.h @@ -50,7 +50,7 @@ namespace KMail { TQ_OBJECT public: - SubscriptionDialogBase( TQWidget *tqparent, + SubscriptionDialogBase( TQWidget *parent, const TQString &caption, KAccount* acct, TQString startPath = TQString() ); @@ -60,10 +60,10 @@ namespace KMail { protected: /** - * Find the tqparent item + * Find the parent item */ void findParentItem ( TQString &name, TQString &path, TQString &compare, - GroupItem **tqparent, GroupItem **oldItem ); + GroupItem **parent, GroupItem **oldItem ); /** * Process the next prefix in mPrefixList @@ -131,7 +131,7 @@ namespace KMail { TQ_OBJECT public: - SubscriptionDialog( TQWidget *tqparent, + SubscriptionDialog( TQWidget *parent, const TQString &caption, KAccount* acct, TQString startPath = TQString() ); diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index dab5665e0..d5a8d3753 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -1004,10 +1004,10 @@ TQString TemplateParser::findTemplate() TQString tmpl; if ( !mFolder ) { // find folder message belongs to - mFolder = mMsg->tqparent(); + mFolder = mMsg->parent(); if ( !mFolder ) { if ( mOrigMsg ) { - mFolder = mOrigMsg->tqparent(); + mFolder = mOrigMsg->parent(); } if ( !mFolder ) { kdDebug(5006) << "Oops! No folder for message" << endl; diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 09614064d..b3c05c293 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -38,8 +38,8 @@ #include "templatesconfiguration.h" -TemplatesConfiguration::TemplatesConfiguration( TQWidget *tqparent, const char *name ) - :TemplatesConfigurationBase( tqparent, name ) +TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *name ) + :TemplatesConfigurationBase( parent, name ) { TQFont f = KGlobalSettings::fixedFont(); textEdit_new->setFont( f ); diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h index 48293a06e..47dbdea5d 100644 --- a/kmail/templatesconfiguration.h +++ b/kmail/templatesconfiguration.h @@ -33,7 +33,7 @@ class TemplatesConfiguration : public TemplatesConfigurationBase public: - TemplatesConfiguration( TQWidget *tqparent = 0, const char *name = 0 ); + TemplatesConfiguration( TQWidget *parent = 0, const char *name = 0 ); void loadFromGlobal(); void saveToGlobal(); diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index 269c40c04..825585633 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -30,9 +30,9 @@ #include "templatesinsertcommand.h" -TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *tqparent, +TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, const char *name ) - : TQPushButton( tqparent, name ) + : TQPushButton( parent, name ) { setText( i18n( "&Insert Command..." ) ); connect( this, TQT_SIGNAL( clicked() ), diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h index 512552448..2251340d3 100644 --- a/kmail/templatesinsertcommand.h +++ b/kmail/templatesinsertcommand.h @@ -33,7 +33,7 @@ class TemplatesInsertCommand : public TQPushButton TQ_OBJECT public: - TemplatesInsertCommand( TQWidget *tqparent, const char *name = 0 ); + TemplatesInsertCommand( TQWidget *parent, const char *name = 0 ); ~TemplatesInsertCommand(); public: diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index 137dbfcdc..19aff3155 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -27,9 +27,9 @@ using namespace KMail; -TreeBase::TreeBase( TQWidget *tqparent, KMFolderTree *folderTree, +TreeBase::TreeBase( TQWidget *parent, KMFolderTree *folderTree, const TQString &preSelection, bool mustBeReadWrite ) - : KListView( tqparent ), mFolderTree( folderTree ) + : KListView( parent ), mFolderTree( folderTree ) { Q_UNUSED( preSelection ); Q_UNUSED( mustBeReadWrite ); @@ -116,13 +116,13 @@ void TreeBase::recolorRows() TQListViewItem * item = it.current() ; if ( item->isVisible() ) { bool visible = true; - TQListViewItem * tqparent = item->tqparent(); - while ( tqparent ) { - if (!tqparent->isOpen()) { + TQListViewItem * parent = item->parent(); + while ( parent ) { + if (!parent->isOpen()) { visible = false; break; } - tqparent = tqparent->tqparent(); + parent = parent->parent(); } if ( visible ) { @@ -174,7 +174,7 @@ void TreeBase::reload( bool mustBeReadWrite, bool showOutbox, bool showImapFolde } else { if ( depth > lastDepth ) { - // next lower level - tqparent node will get opened + // next lower level - parent node will get opened item = createItem( lastItem ); lastItem->setOpen( true ); } @@ -183,15 +183,15 @@ void TreeBase::reload( bool mustBeReadWrite, bool showOutbox, bool showImapFolde path = path.section( '/', 0, -2 - (lastDepth-depth) ); if ( depth == lastDepth ) // same level - behind previous item - item = createItem( lastItem->tqparent(), lastItem ); + item = createItem( lastItem->parent(), lastItem ); else if ( depth < lastDepth ) { // above previous level - might be more than one level difference // but highest possibility is top level - while ( ( depth <= --lastDepth ) && lastItem->tqparent() ) { - lastItem = static_cast<TQListViewItem *>( lastItem->tqparent() ); + while ( ( depth <= --lastDepth ) && lastItem->parent() ) { + lastItem = static_cast<TQListViewItem *>( lastItem->parent() ); } - if ( lastItem->tqparent() ) - item = createItem( lastItem->tqparent(), lastItem ); + if ( lastItem->parent() ) + item = createItem( lastItem->parent(), lastItem ); else { // chain somehow broken - what does cause this ??? kdDebug( 5006 ) << "You shouldn't get here: depth=" << depth diff --git a/kmail/treebase.h b/kmail/treebase.h index e11a518c6..f786377b7 100644 --- a/kmail/treebase.h +++ b/kmail/treebase.h @@ -35,7 +35,7 @@ class TreeBase : public KListView Q_OBJECT TQ_OBJECT public: - TreeBase( TQWidget * tqparent, KMFolderTree *folderTree, + TreeBase( TQWidget * parent, KMFolderTree *folderTree, const TQString &preSelection, bool mustBeReadWrite ); virtual ~TreeBase() {} diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index cee3a3cb1..fbcf46c82 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -428,8 +428,8 @@ namespace { namespace KMail { - Vacation::Vacation( TQObject * tqparent, bool checkOnly, const char * name ) - : TQObject( tqparent, name ), mSieveJob( 0 ), mDialog( 0 ), mWasActive( false ), mCheckOnly( checkOnly ) + Vacation::Vacation( TQObject * parent, bool checkOnly, const char * name ) + : TQObject( parent, name ), mSieveJob( 0 ), mDialog( 0 ), mWasActive( false ), mCheckOnly( checkOnly ) { mUrl = findURL(); kdDebug(5006) << "Vacation: found url \"" << mUrl.prettyURL() << "\"" << endl; diff --git a/kmail/vacation.h b/kmail/vacation.h index 5913548be..c7a9980aa 100644 --- a/kmail/vacation.h +++ b/kmail/vacation.h @@ -39,7 +39,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT public: - Vacation( TQObject * tqparent=0, bool checkOnly = false, const char * name=0 ); + Vacation( TQObject * parent=0, bool checkOnly = false, const char * name=0 ); virtual ~Vacation(); bool isUsable() const { return !mUrl.isEmpty(); } diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp index e2ca8e0c0..87e1d8411 100644 --- a/kmail/vacationdialog.cpp +++ b/kmail/vacationdialog.cpp @@ -39,9 +39,9 @@ using KMime::HeaderParsing::parseAddressList; namespace KMail { - VacationDialog::VacationDialog( const TQString & caption, TQWidget * tqparent, + VacationDialog::VacationDialog( const TQString & caption, TQWidget * parent, const char * name, bool modal ) - : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, tqparent, name, modal ) + : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, parent, name, modal ) { KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h index 9cedf4efa..bbb2a2c14 100644 --- a/kmail/vacationdialog.h +++ b/kmail/vacationdialog.h @@ -38,7 +38,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT public: - VacationDialog( const TQString & caption, TQWidget * tqparent=0, + VacationDialog( const TQString & caption, TQWidget * parent=0, const char * name=0, bool modal=true ); virtual ~VacationDialog(); diff --git a/kmail/vcardviewer.cpp b/kmail/vcardviewer.cpp index 0fd71d94e..0e34f72cc 100644 --- a/kmail/vcardviewer.cpp +++ b/kmail/vcardviewer.cpp @@ -38,11 +38,11 @@ using KABC::Addressee; #include <tqstring.h> #if defined(KABC_VCARD_ENCODING_FIX) -KMail::VCardViewer::VCardViewer( TQWidget *tqparent, const TQByteArray &vCard, const char *name ) +KMail::VCardViewer::VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name ) #else -KMail::VCardViewer::VCardViewer( TQWidget *tqparent, const TQString &vCard, const char *name ) +KMail::VCardViewer::VCardViewer( TQWidget *parent, const TQString &vCard, const char *name ) #endif - : KDialogBase( tqparent, name, false, i18n("VCard Viewer"), User1|User2|User3|Close, Close, + : KDialogBase( parent, name, false, i18n("VCard Viewer"), User1|User2|User3|Close, Close, true, i18n("&Import"), i18n("&Next Card"), i18n("&Previous Card") ) { mAddresseeView = new AddresseeView(this); diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h index 3da13c395..87a6611af 100644 --- a/kmail/vcardviewer.h +++ b/kmail/vcardviewer.h @@ -40,9 +40,9 @@ class VCardViewer : public KDialogBase TQ_OBJECT public: #if defined(KABC_VCARD_ENCODING_FIX) - VCardViewer( TQWidget *tqparent, const TQByteArray &vCard, const char *name ); + VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name ); #else - VCardViewer( TQWidget *tqparent, const TQString &vCard, const char *name ); + VCardViewer( TQWidget *parent, const TQString &vCard, const char *name ); #endif virtual ~VCardViewer(); diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index b49394dc7..5b56e2919 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -70,8 +70,8 @@ using namespace KPIM; namespace KMail { - XFaceConfigurator::XFaceConfigurator( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ) + XFaceConfigurator::XFaceConfigurator( TQWidget * parent, const char * name ) + : TQWidget( parent, name ) { // tmp. vars: TQLabel * label; diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h index 8d0792c86..e8fa1b0e7 100644 --- a/kmail/xfaceconfigurator.h +++ b/kmail/xfaceconfigurator.h @@ -33,7 +33,7 @@ namespace KMail { Q_OBJECT TQ_OBJECT public: - XFaceConfigurator( TQWidget * tqparent=0, const char * name=0 ); + XFaceConfigurator( TQWidget * parent=0, const char * name=0 ); virtual ~XFaceConfigurator(); bool isXFaceEnabled() const; diff --git a/kmailcvt/README b/kmailcvt/README index b97f783e8..dbdf247a8 100644 --- a/kmailcvt/README +++ b/kmailcvt/README @@ -23,7 +23,7 @@ the following methods that you may want to use: void setOverall( int percent = 0 ); // Set overall percentage void addLog( const QString& log ); // Add a message for the user to see void alert( const QString& message ); // Tell user something has gone wrong - QWidget *tqparent(); // The tqparent widget + QWidget *parent(); // The parent widget bool removeDupMsg; // true, if user selected 'remove duplicated messages' diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx index 417dd8e58..713a1bf70 100644 --- a/kmailcvt/filter_evolution.cxx +++ b/kmailcvt/filter_evolution.cxx @@ -51,7 +51,7 @@ void FilterEvolution::import(FilterInfo *info) evolDir = TQDir::homeDirPath(); } - mailDir = KFileDialog::getExistingDirectory(evolDir, info->tqparent()); + mailDir = KFileDialog::getExistingDirectory(evolDir, info->parent()); if (mailDir.isEmpty()) { info->alert(i18n("No directory selected.")); diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx index 29b636b90..e80d7a84a 100644 --- a/kmailcvt/filter_evolution_v2.cxx +++ b/kmailcvt/filter_evolution_v2.cxx @@ -54,7 +54,7 @@ void FilterEvolution_v2::import(FilterInfo *info) evolDir = TQDir::homeDirPath(); } - //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent()); + //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent()); KFileDialog *kfd; kfd = new KFileDialog( evolDir, "", 0, "kfiledialog", true ); kfd->setMode(KFile::Directory | KFile::LocalOnly); diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx index 0fcb345ea..648f361d4 100644 --- a/kmailcvt/filter_lnotes.cxx +++ b/kmailcvt/filter_lnotes.cxx @@ -53,7 +53,7 @@ void FilterLNotes::import(FilterInfo *info) { totalFiles = 0; TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("All Files (*)"), - inf->tqparent() ); + inf->parent() ); totalFiles = filenames.count(); inf->setOverall(0); diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx index d50f28c8a..ebc34fd60 100644 --- a/kmailcvt/filter_mailapp.cxx +++ b/kmailcvt/filter_mailapp.cxx @@ -45,7 +45,7 @@ void FilterMailApp::import(FilterInfo *info) int overall_status = 0; bool first_msg = true; - TQString directory = KFileDialog::getExistingDirectory( TQDir::homeDirPath(), info->tqparent() ); + TQString directory = KFileDialog::getExistingDirectory( TQDir::homeDirPath(), info->parent() ); //qDebug("starting by looking in directory: %s", directory.latin1()); if ( directory.isEmpty() ) { diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx index f456b1084..d77db9761 100644 --- a/kmailcvt/filter_mbox.cxx +++ b/kmailcvt/filter_mbox.cxx @@ -45,7 +45,7 @@ void FilterMBox::import(FilterInfo *info) int overall_status = 0; bool first_msg = true; - TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("mbox Files (*)"), info->tqparent() ); + TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("mbox Files (*)"), info->parent() ); info->setOverall(0); for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename, ++currentFile) { diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx index 5dd8c6e51..bc5d16fdf 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cxx @@ -55,7 +55,7 @@ FilterOE::~FilterOE() void FilterOE::import(FilterInfo *info) { // Select directory containing plain text emails - mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->tqparent()); + mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->parent()); if (mailDir.isEmpty()) { // No directory selected info->alert(i18n("No directory selected.")); return; @@ -231,7 +231,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) { if(info->shouldTerminate()) return; - TQ_UINT32 self, unknown, nextIndexPtr, tqparent, indexCount; + TQ_UINT32 self, unknown, nextIndexPtr, parent, indexCount; TQ_UINT8 unknown2, ptrCount; TQ_UINT16 unknown3; int wasAt = ds.tqdevice()->at(); @@ -239,7 +239,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) kdDebug() << "Reading index of file " << folderName << endl; - ds >> self >> unknown >> nextIndexPtr >> tqparent >> unknown2 >> ptrCount >> unknown3 >> indexCount; // _dbx_tableindexstruct + ds >> self >> unknown >> nextIndexPtr >> parent >> unknown2 >> ptrCount >> unknown3 >> indexCount; // _dbx_tableindexstruct kdDebug() << "This index has " << (int) ptrCount << " data pointers" << endl; for (int count = 0; count < ptrCount; count++) { @@ -316,7 +316,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos folderEntry[2] = TQString::number(value); } else if (type == 0x81) { - // kdDebug() << "**** FOLDER: tqparent ID ****" << endl; + // kdDebug() << "**** FOLDER: parent ID ****" << endl; folderEntry[3] = TQString::number(value); } } diff --git a/kmailcvt/filter_oe.hxx b/kmailcvt/filter_oe.hxx index e0e990c1d..821aa5dfa 100644 --- a/kmailcvt/filter_oe.hxx +++ b/kmailcvt/filter_oe.hxx @@ -68,7 +68,7 @@ private: // Private methods 1. descriptive folder name 2. filename 3. ID of current folder - 4. ID of tqparent folder + 4. ID of parent folder */ typedef FolderStructureBase<4> FolderStructure; /** matrix with information about the folder structure*/ diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx index b0f362474..37e19aa1e 100644 --- a/kmailcvt/filter_opera.cxx +++ b/kmailcvt/filter_opera.cxx @@ -48,7 +48,7 @@ void FilterOpera::import(FilterInfo *info) startdir = TQDir::homeDirPath(); } - //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent()); + //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent()); KFileDialog *kfd; kfd = new KFileDialog( startdir, "", 0, "kfiledialog", true ); kfd->setMode(KFile::Directory | KFile::LocalOnly); diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx index f222d88c7..7d6a9b8c4 100644 --- a/kmailcvt/filter_outlook.cxx +++ b/kmailcvt/filter_outlook.cxx @@ -50,7 +50,7 @@ void FilterOutlook::import(FilterInfo *info) info->addLog(i18n("No files found for import.")); TQString outlookDir; - outlookDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent()); + outlookDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent()); TQDir importDir (outlookDir); TQStringList files = importDir.entryList("*.[pP][sS][tT]", TQDir::Files, TQDir::Name); for ( TQStringList::Iterator pstFile = files.begin(); pstFile != files.end(); ++pstFile) { diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx index 2b3a3e823..a0dbad135 100644 --- a/kmailcvt/filter_plain.cxx +++ b/kmailcvt/filter_plain.cxx @@ -39,7 +39,7 @@ FilterPlain::~FilterPlain() void FilterPlain::import(FilterInfo *info) { // Select directory containing plain text emails - TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->tqparent()); + TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->parent()); if (mailDir.isEmpty()) { // No directory selected info->alert(i18n("No directory selected.")); return; diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx index 52c5c7fc6..982d713a9 100644 --- a/kmailcvt/filter_pmail.cxx +++ b/kmailcvt/filter_pmail.cxx @@ -81,13 +81,13 @@ void FilterPMail::import(FilterInfo *info) info->setOverall(100); } -/** this looks for all files with the filetqmask 'tqmask' and calls the 'workFunc' on each of them */ -void FilterPMail::processFiles(const TQString& tqmask, void(FilterPMail::* workFunc)(const TQString&) ) +/** this looks for all files with the filemask 'mask' and calls the 'workFunc' on each of them */ +void FilterPMail::processFiles(const TQString& mask, void(FilterPMail::* workFunc)(const TQString&) ) { if (inf->shouldTerminate()) return; - TQStringList files = dir.entryList(tqmask, TQDir::Files, TQDir::Name); - //kdDebug() << "Mask is " << tqmask << " count is " << files.count() << endl; + TQStringList files = dir.entryList(mask, TQDir::Files, TQDir::Name); + //kdDebug() << "Mask is " << mask << " count is " << files.count() << endl; for ( TQStringList::Iterator mailFile = files.begin(); mailFile != files.end(); ++mailFile ) { // Notify current file TQFileInfo mailfileinfo(*mailFile); diff --git a/kmailcvt/filter_pmail.hxx b/kmailcvt/filter_pmail.hxx index 86f08ce6d..664fdcc1b 100644 --- a/kmailcvt/filter_pmail.hxx +++ b/kmailcvt/filter_pmail.hxx @@ -32,8 +32,8 @@ public: void import(FilterInfo *info); protected: - /** this looks for all files with the filetqmask 'tqmask' and calls the 'workFunc' on each of them */ - void processFiles(const TQString& tqmask, void(FilterPMail::* workFunc)(const TQString&) ); + /** this looks for all files with the filemask 'mask' and calls the 'workFunc' on each of them */ + void processFiles(const TQString& mask, void(FilterPMail::* workFunc)(const TQString&) ); /** this function imports one *.CNM message */ void importNewMessage(const TQString& file); /** this function imports one mail folder file (*.PMM) */ @@ -57,7 +57,7 @@ private: 1. type (2 for root-folder, 1 for folder, 0 for mailarchiv) 2. type (1 for root-folder, 3 for folder, 0 for mailarchiv) 3. "ID:flag:filename" of folder/archiv - 4. "ID:name" of tqparent folder + 4. "ID:name" of parent folder 5. name of folder/archiv */ TQValueList<FolderStructure> folderMatrix; diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx index 2ea7dc580..04dcdb127 100644 --- a/kmailcvt/filter_thebat.cxx +++ b/kmailcvt/filter_thebat.cxx @@ -213,7 +213,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) tmp.file()->writeBlock( input, endPos-lastPos ); tmp.close(); - //KMessageBox::warningContinueCancel(info->tqparent(), ""); + //KMessageBox::warningContinueCancel(info->parent(), ""); if(info->removeDupMsg) addMessage( info, _path, tmp.name() ); else diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx index aaaaa6da8..8feae7fd0 100644 --- a/kmailcvt/filters.cxx +++ b/kmailcvt/filters.cxx @@ -35,9 +35,9 @@ bool FilterInfo::s_terminateASAP = false; -FilterInfo::FilterInfo( KImportPageDlg* dlg, TQWidget* tqparent , bool _removeDupMsg) +FilterInfo::FilterInfo( KImportPageDlg* dlg, TQWidget* parent , bool _removeDupMsg) : m_dlg( dlg ), - m_tqparent( tqparent ) + m_parent( parent ) { removeDupMsg = _removeDupMsg; s_terminateASAP = false; @@ -99,7 +99,7 @@ void FilterInfo::clear() void FilterInfo::alert( const TQString& message ) { - KMessageBox::information( m_tqparent, message ); + KMessageBox::information( m_parent, message ); } void FilterInfo::terminateASAP() diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.hxx index a5f468e43..db539428d 100644 --- a/kmailcvt/filters.hxx +++ b/kmailcvt/filters.hxx @@ -33,7 +33,7 @@ class FilterInfo { public: - FilterInfo(KImportPageDlg *dlg, TQWidget *tqparent, bool _removeDupMsg); + FilterInfo(KImportPageDlg *dlg, TQWidget *parent, bool _removeDupMsg); ~FilterInfo(); void seStatusMsg( const TQString& status ); @@ -48,12 +48,12 @@ class FilterInfo static void terminateASAP(); bool shouldTerminate(); - TQWidget *tqparent() { return m_tqparent; } + TQWidget *parent() { return m_parent; } bool removeDupMsg; private: KImportPageDlg *m_dlg; - TQWidget *m_tqparent; + TQWidget *m_parent; static bool s_terminateASAP; }; diff --git a/kmailcvt/kimportpage.cpp b/kmailcvt/kimportpage.cpp index 5c62fb00c..62e5b7de7 100644 --- a/kmailcvt/kimportpage.cpp +++ b/kmailcvt/kimportpage.cpp @@ -21,7 +21,7 @@ #include "kimportpage.h" -KImportPage::KImportPage(TQWidget *tqparent, const char *name ) : KImportPageDlg(tqparent,name) { +KImportPage::KImportPage(TQWidget *parent, const char *name ) : KImportPageDlg(parent,name) { mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png")); } diff --git a/kmailcvt/kimportpage.h b/kmailcvt/kimportpage.h index b7f4de53e..76a9844f2 100644 --- a/kmailcvt/kimportpage.h +++ b/kmailcvt/kimportpage.h @@ -24,7 +24,7 @@ class KImportPage : public KImportPageDlg { Q_OBJECT TQ_OBJECT public: - KImportPage(TQWidget *tqparent=0, const char *name=0); + KImportPage(TQWidget *parent=0, const char *name=0); ~KImportPage(); }; diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp index 5334ac52d..cf10f7fb1 100644 --- a/kmailcvt/kmailcvt.cpp +++ b/kmailcvt/kmailcvt.cpp @@ -22,8 +22,8 @@ #include <kdebug.h> #include "filters.hxx" -KMailCVT::KMailCVT(TQWidget *tqparent, const char *name) - : KWizard(tqparent, name, true) { +KMailCVT::KMailCVT(TQWidget *parent, const char *name) + : KWizard(parent, name, true) { setCaption( i18n( "KMailCVT Import Tool" ) ); diff --git a/kmailcvt/kmailcvt.h b/kmailcvt/kmailcvt.h index e5febb23e..63b2506ba 100644 --- a/kmailcvt/kmailcvt.h +++ b/kmailcvt/kmailcvt.h @@ -29,7 +29,7 @@ class KMailCVT : public KWizard { Q_OBJECT TQ_OBJECT public: - KMailCVT(TQWidget* tqparent=0, const char *name=0); + KMailCVT(TQWidget* parent=0, const char *name=0); ~KMailCVT(); virtual void next(); diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index daac374fe..a562219a3 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -39,7 +39,7 @@ #include "kselfilterpage.h" -KSelFilterPage::KSelFilterPage(TQWidget *tqparent, const char *name ) : KSelFilterPageDlg(tqparent,name) { +KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilterPageDlg(parent,name) { mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png")); mFilterList.setAutoDelete( TRUE ); diff --git a/kmailcvt/kselfilterpage.h b/kmailcvt/kselfilterpage.h index 4dc4aa6df..a2a831453 100644 --- a/kmailcvt/kselfilterpage.h +++ b/kmailcvt/kselfilterpage.h @@ -27,7 +27,7 @@ class KSelFilterPage : public KSelFilterPageDlg { Q_OBJECT TQ_OBJECT public: - KSelFilterPage(TQWidget *tqparent=0, const char *name=0); + KSelFilterPage(TQWidget *parent=0, const char *name=0); ~KSelFilterPage(); public: void addFilter(Filter *f); diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index 2fef0da67..bd35ddf8b 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -56,10 +56,10 @@ K_EXPORT_COMPONENT_FACTORY( libkmobile_gnokii, KMobileGnokii() ) /* createObject needs to be reimplemented by every KMobileDevice driver */ -TQObject *KMobileGnokii::createObject( TQObject *tqparent, const char *name, +TQObject *KMobileGnokii::createObject( TQObject *parent, const char *name, const char *, const TQStringList &args ) { - return new KMobileGnokii( tqparent, name, args ); + return new KMobileGnokii( parent, name, args ); } @@ -494,7 +494,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt // connect the tqdevice and ask user to turn tqdevice on (if necessary) -bool KMobileGnokii::connectDevice(TQWidget * /*tqparent*/) +bool KMobileGnokii::connectDevice(TQWidget * /*parent*/) { if (connected()) return true; @@ -506,7 +506,7 @@ bool KMobileGnokii::connectDevice(TQWidget * /*tqparent*/) } // disconnect the tqdevice and return true, if sucessful -bool KMobileGnokii::disconnectDevice(TQWidget * /*tqparent*/) +bool KMobileGnokii::disconnectDevice(TQWidget * /*parent*/) { if (!connected()) return true; @@ -517,11 +517,11 @@ bool KMobileGnokii::disconnectDevice(TQWidget * /*tqparent*/) } // provice the own configuration dialog -bool KMobileGnokii::configDialog(TQWidget *tqparent) +bool KMobileGnokii::configDialog(TQWidget *parent) { TQString model, connection, port, baud; int ok = 0; - GnokiiConfig *dialog = new GnokiiConfig(tqparent); + GnokiiConfig *dialog = new GnokiiConfig(parent); if (dialog) { dialog->setValues(m_modelnr, m_connection, m_port, m_baud); ok = dialog->exec(); diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h index 9562c2221..96f32a5c0 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.h +++ b/kmobile/devices/gnokii/gnokii_mobile.h @@ -36,15 +36,15 @@ public: ~KMobileGnokii(); // createObject needs to be reimplemented by every KMobileDevice driver - TQObject *createObject( TQObject *tqparent=0, const char *name=0, + TQObject *createObject( TQObject *parent=0, const char *name=0, const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() ); // connect, disconnect and current status - bool connectDevice(TQWidget *tqparent); - bool disconnectDevice(TQWidget *tqparent); + bool connectDevice(TQWidget *parent); + bool disconnectDevice(TQWidget *parent); // provide a tqdevice-specific configure dialog - bool configDialog(TQWidget *tqparent); + bool configDialog(TQWidget *parent); // filename and path to gnokii-icon TQString iconFileName() const; diff --git a/kmobile/devices/gnokii/gnokiiconfig.cpp b/kmobile/devices/gnokii/gnokiiconfig.cpp index e8ad19bdd..07bc46f46 100644 --- a/kmobile/devices/gnokii/gnokiiconfig.cpp +++ b/kmobile/devices/gnokii/gnokiiconfig.cpp @@ -43,8 +43,8 @@ #define BAUDRATES "57600 38400 19200 14400 9600 4800 2400" -GnokiiConfig::GnokiiConfig( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : GnokiiConfigUI(tqparent, name, modal, fl) +GnokiiConfig::GnokiiConfig( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : GnokiiConfigUI(parent, name, modal, fl) { TQStringList list = TQStringList::split(" ", MODELS); cb_Model->insertStringList(list); diff --git a/kmobile/devices/gnokii/gnokiiconfig.h b/kmobile/devices/gnokii/gnokiiconfig.h index bb6ffe771..9422fcedc 100644 --- a/kmobile/devices/gnokii/gnokiiconfig.h +++ b/kmobile/devices/gnokii/gnokiiconfig.h @@ -28,7 +28,7 @@ class GnokiiConfig : public GnokiiConfigUI Q_OBJECT TQ_OBJECT public: - GnokiiConfig( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~GnokiiConfig(); void setValues(const TQString &model, const TQString &connection, const TQString &port, const TQString &baud); diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp index c1bcd4929..b5073de87 100644 --- a/kmobile/devices/skeleton/skeleton.cpp +++ b/kmobile/devices/skeleton/skeleton.cpp @@ -35,10 +35,10 @@ K_EXPORT_COMPONENT_FACTORY( libkmobile_skeleton, KMobileSkeleton() ) /* createObject needs to be reimplemented by every KMobileDevice driver */ -TQObject *KMobileSkeleton::createObject( TQObject *tqparent, const char *name, +TQObject *KMobileSkeleton::createObject( TQObject *parent, const char *name, const char *, const TQStringList &args ) { - return new KMobileSkeleton( tqparent, name, args ); + return new KMobileSkeleton( parent, name, args ); } @@ -61,9 +61,9 @@ KMobileSkeleton::~KMobileSkeleton() } // connect the tqdevice and ask user to turn tqdevice on (if necessary) -bool KMobileSkeleton::connectDevice(TQWidget *tqparent) +bool KMobileSkeleton::connectDevice(TQWidget *parent) { - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparent, + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parent, i18n("Please turn on your %1 on now and press continue to proceed.").tqarg(m_tqdeviceName), m_tqdeviceClassName ) ) return false; diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h index 8d5c3db4c..6ae0287b9 100644 --- a/kmobile/devices/skeleton/skeleton.h +++ b/kmobile/devices/skeleton/skeleton.h @@ -35,12 +35,12 @@ public: ~KMobileSkeleton(); // createObject needs to be reimplemented by every KMobileDevice driver - TQObject *createObject( TQObject *tqparent=0, const char *name=0, + TQObject *createObject( TQObject *parent=0, const char *name=0, const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() ); // connect, disconnect and current status - bool connectDevice(TQWidget *tqparent); - bool disconnectDevice(TQWidget *tqparent); + bool connectDevice(TQWidget *parent); + bool disconnectDevice(TQWidget *parent); // returns true, if this tqdevice is read-only (default: false) bool isReadOnly() const; diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index db2e1cd11..8bd1da8a9 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -315,32 +315,32 @@ void KMobile::addDevice() * show dialog to user, in which he may choose and select one of the already * configured mobile tqdevices. */ -KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *tqparent, +KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, enum KMobileDevice::ClassType /*type*/, enum KMobileDevice::Capabilities /*caps*/ ) { int num; - m_tqparent = tqparent; + m_parent = parent; // do we already have some tqdevices configured ? num = readDevicesList(); if (!num) { int answ; - answ = KMessageBox::questionYesNo(tqparent, + answ = KMessageBox::questionYesNo(parent, i18n( "<qt>You have no mobile tqdevices configured yet.<p>" "Do you want to add a tqdevice now ?</qt>" ), i18n( "KDE Mobile Device Access" ), KStdGuiItem::add(), i18n("Do Not Add") ); if (answ != KMessageBox::Yes) return 0L; // add a new tqdevice - addDeviceDialog(tqparent); + addDeviceDialog(parent); } num = readDevicesList(); if (!num) return 0L; // let the user select one of the configured tqdevices - KMobile_selectiondialog *dialog = new KMobile_selectiondialog(tqparent); + KMobile_selectiondialog *dialog = new KMobile_selectiondialog(parent); if (!dialog) return 0L; diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp index cc25c3664..a4d807da0 100644 --- a/kmobile/kmobiledevice.cpp +++ b/kmobile/kmobiledevice.cpp @@ -104,9 +104,9 @@ bool KMobileDevice::isReadOnly() const return false; } -bool KMobileDevice::configDialog( TQWidget *tqparent ) +bool KMobileDevice::configDialog( TQWidget *parent ) { - KMessageBox::information( tqparent, + KMessageBox::information( parent, i18n("This tqdevice does not need any configuration."), tqdeviceName() ); return true; diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index d89e3f2d8..5cf19092d 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -51,10 +51,10 @@ class KConfig; * For a KMobileSomeDevice driver you have to write the following code: * <pre> * K_EXPORT_COMPONENT_FACTORY( libkmobile_sometqdevice, KMobileSomeDevice() ); - * TQObject *KMobileSomeDevice::createObject( TQObject *tqparent, const char *name, + * TQObject *KMobileSomeDevice::createObject( TQObject *parent, const char *name, * const char *, const TQStringList &args ) * { - * return new KMobileSomeDevice( tqparent, name, args ); + * return new KMobileSomeDevice( parent, name, args ); * } * </pre> * @@ -72,7 +72,7 @@ public: /** * Construct a new KMobileDevice. * - * @param obj The tqparent object. This is usually 0. + * @param obj The parent object. This is usually 0. * @param name The object name. For session management and window management to work. * @param args Additional commandline parameters - the first entry has the config file name. */ @@ -83,16 +83,16 @@ public: /** * Connect to the device. * - * @param tqparent The tqparent widget. It will be used as tqparent for message boxes. + * @param parent The parent widget. It will be used as parent for message boxes. */ - virtual bool connectDevice( TQWidget *tqparent = 0 ) = 0; + virtual bool connectDevice( TQWidget *parent = 0 ) = 0; /** * Disconnect from the device. * - * @param tqparent The tqparent widget. It will be used as tqparent for message boxes. + * @param parent The parent widget. It will be used as parent for message boxes. */ - virtual bool disconnectDevice( TQWidget *tqparent = 0 ) = 0; + virtual bool disconnectDevice( TQWidget *parent = 0 ) = 0; /** * Returns true, if the tqdevice is currently connected and the link is online. @@ -135,9 +135,9 @@ public: /** * Pop-up a tqdevice-specific configuration dialog. * - * @param tqparent The tqparent widget. It will be used as tqparent for the configuration dialog. + * @param parent The parent widget. It will be used as parent for the configuration dialog. */ - virtual bool configDialog(TQWidget *tqparent); + virtual bool configDialog(TQWidget *parent); // The ClassType may be used e.g. to select an suitable icon enum ClassType { diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index 5469902ee..3778f1c16 100644 --- a/kmobile/kmobileitem.cpp +++ b/kmobile/kmobileitem.cpp @@ -29,8 +29,8 @@ #define PRINT_DEBUG kdDebug() << "KMobileItem: " -KMobileItem::KMobileItem(TQIconView *tqparent, KConfig *_config, KService::Ptr service) - : TQObject(tqparent), TQIconViewItem(tqparent), m_dev(0L) +KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr service) + : TQObject(parent), TQIconViewItem(parent), m_dev(0L) { config = _config; @@ -51,8 +51,8 @@ KMobileItem::KMobileItem(TQIconView *tqparent, KConfig *_config, KService::Ptr s } /* restore this item from the config file */ -KMobileItem::KMobileItem(TQIconView *tqparent, KConfig *_config, int reload_index) - : TQObject(tqparent), TQIconViewItem(tqparent), m_dev(0L) +KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, int reload_index) + : TQObject(parent), TQIconViewItem(parent), m_dev(0L) { config = _config; diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h index cfbca72c7..e82a5cb15 100644 --- a/kmobile/kmobileitem.h +++ b/kmobile/kmobileitem.h @@ -16,8 +16,8 @@ class KMobileItem : public TQObject, public TQIconViewItem TQ_OBJECT friend class KMobileView; public: - KMobileItem(TQIconView *tqparent, KConfig *config, KService::Ptr service); - KMobileItem(TQIconView *tqparent, KConfig *config, int reload_index); + KMobileItem(TQIconView *parent, KConfig *config, KService::Ptr service); + KMobileItem(TQIconView *parent, KConfig *config, int reload_index); virtual ~KMobileItem(); void configSave() const; diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 32fb916ae..26ac4d0b3 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -32,8 +32,8 @@ #include "kmobileitem.h" -KMobileView::KMobileView(TQWidget *tqparent, KConfig *_config) - : DCOPObject("kmobileIface"), TQIconView(tqparent) +KMobileView::KMobileView(TQWidget *parent, KConfig *_config) + : DCOPObject("kmobileIface"), TQIconView(parent) { m_config = _config; setSelectionMode(TQIconView::Single); diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h index bcbfd4e1e..4c0826f53 100644 --- a/kmobile/kmobileview.h +++ b/kmobile/kmobileview.h @@ -25,7 +25,7 @@ class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface Q_OBJECT TQ_OBJECT public: - KMobileView(TQWidget *tqparent, KConfig *_config); + KMobileView(TQWidget *parent, KConfig *_config); virtual ~KMobileView(); bool addNewDevice(KConfig *config, KService::Ptr service); diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp index a6d113350..2bb907445 100644 --- a/kmobile/pref.cpp +++ b/kmobile/pref.cpp @@ -24,8 +24,8 @@ KMobilePreferences::KMobilePreferences() m_pageTwo = new KMobilePrefPageTwo(frame); } -KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *tqparent) - : TQFrame(tqparent) +KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent) + : TQFrame(parent) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -33,8 +33,8 @@ KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *tqparent) new TQLabel(i18n("Add something here"), this); } -KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *tqparent) - : TQFrame(tqparent) +KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *parent) + : TQFrame(parent) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); diff --git a/kmobile/pref.h b/kmobile/pref.h index 641571082..ad28b1de5 100644 --- a/kmobile/pref.h +++ b/kmobile/pref.h @@ -28,7 +28,7 @@ class KMobilePrefPageOne : public TQFrame Q_OBJECT TQ_OBJECT public: - KMobilePrefPageOne(TQWidget *tqparent = 0); + KMobilePrefPageOne(TQWidget *parent = 0); }; class KMobilePrefPageTwo : public TQFrame @@ -36,7 +36,7 @@ class KMobilePrefPageTwo : public TQFrame Q_OBJECT TQ_OBJECT public: - KMobilePrefPageTwo(TQWidget *tqparent = 0); + KMobilePrefPageTwo(TQWidget *parent = 0); }; #endif // _KMOBILEPREF_H_ diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index 76546cce0..c0c0bec03 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -35,7 +35,7 @@ #include "kmobileview.h" -SystemTray::SystemTray(KMainWindow *tqparent, const char *name) : KSystemTray(tqparent, name) +SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(parent, name) { m_appPix = KGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small); @@ -43,7 +43,7 @@ SystemTray::SystemTray(KMainWindow *tqparent, const char *name) : KSystemTray(tq setToolTip(); - m_actionCollection = tqparent->actionCollection(); + m_actionCollection = parent->actionCollection(); KAction *addAction = m_actionCollection->action("tqdevice_add"); KPopupMenu* menu = contextMenu(); @@ -60,7 +60,7 @@ SystemTray::~SystemTray() void SystemTray::contextMenuAboutToShow(KPopupMenu *menu) { - KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(tqparent())); + KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent())); const int pos = 3; while (menu->idAt(pos)>=SYSTEMTRAY_STARTID && @@ -84,7 +84,7 @@ void SystemTray::menuItemSelected() if (m_menuID<SYSTEMTRAY_STARTID || m_menuID>SYSTEMTRAY_STARTID+1000) return; TQString devName = contextMenu()->text(m_menuID); - KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(tqparent())); + KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent())); main->mainView()->startKonqueror(devName); } diff --git a/kmobile/systemtray.h b/kmobile/systemtray.h index dce846174..87843c306 100644 --- a/kmobile/systemtray.h +++ b/kmobile/systemtray.h @@ -31,7 +31,7 @@ class SystemTray : public KSystemTray TQ_OBJECT public: - SystemTray(KMainWindow *tqparent = 0, const char *name = 0); + SystemTray(KMainWindow *parent = 0, const char *name = 0); virtual ~SystemTray(); protected slots: diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index dde18d69a..318832fc0 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -75,11 +75,11 @@ using namespace KNode; TQValueList<ArticleWidget*> ArticleWidget::mInstances; -ArticleWidget::ArticleWidget( TQWidget *tqparent, +ArticleWidget::ArticleWidget( TQWidget *parent, KXMLGUIClient *guiClient, KActionCollection *actionCollection, const char *name ) : - TQWidget( tqparent, name ), + TQWidget( parent, name ), mArticle( 0 ), mViewer( 0 ), mCSSHelper( 0 ), diff --git a/knode/articlewidget.h b/knode/articlewidget.h index 7333bf5d0..2b951ee7a 100644 --- a/knode/articlewidget.h +++ b/knode/articlewidget.h @@ -57,7 +57,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer { public: /// Construct a new article widget - ArticleWidget( TQWidget *tqparent, + ArticleWidget( TQWidget *parent, KXMLGUIClient *guiClient, KActionCollection *actionCollection, const char *name = 0 ); diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 3b76b26ec..1451844df 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -32,8 +32,8 @@ #include "knmainwidget.h" -KNHeaderView::KNHeaderView(TQWidget *tqparent, const char *name) : - KListView(tqparent,name), +KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : + KListView(parent,name), mSortCol( -1 ), mSortAsc( true ), mSortByThreadChangeDate( false ), @@ -171,11 +171,11 @@ void KNHeaderView::ensureItemVisibleWithMargin( const TQListViewItem *i ) if ( !i ) return; - TQListViewItem *tqparent = i->tqparent(); - while ( tqparent ) { - if ( !tqparent->isOpen() ) - tqparent->setOpen( true ); - tqparent = tqparent->tqparent(); + TQListViewItem *parent = i->parent(); + while ( parent ) { + if ( !parent->isOpen() ) + parent->setOpen( true ); + parent = parent->parent(); } mDelayedCenter = -1; @@ -582,9 +582,9 @@ void KNHeaderView::resetCurrentTime() //BEGIN: KNHeaderViewToolTip ================================================== -KNHeaderViewToolTip::KNHeaderViewToolTip( KNHeaderView *tqparent ) : - TQToolTip( tqparent->viewport() ), - listView( tqparent ) +KNHeaderViewToolTip::KNHeaderViewToolTip( KNHeaderView *parent ) : + TQToolTip( parent->viewport() ), + listView( parent ) { } diff --git a/knode/headerview.h b/knode/headerview.h index c7d4c9f62..134f1edd0 100644 --- a/knode/headerview.h +++ b/knode/headerview.h @@ -32,7 +32,7 @@ class KNHeaderView : public KListView { friend class KNHdrViewItem; public: - KNHeaderView( TQWidget *tqparent, const char *name = 0 ); + KNHeaderView( TQWidget *parent, const char *name = 0 ); ~KNHeaderView(); void setActive( TQListViewItem *item ); @@ -108,7 +108,7 @@ class KNHeaderView : public KListView { class KNHeaderViewToolTip : public TQToolTip { public: - KNHeaderViewToolTip( KNHeaderView *tqparent ); + KNHeaderViewToolTip( KNHeaderView *parent ); protected: void maybeTip( const TQPoint &p ); diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index 01678265d..627ff4cdd 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -34,8 +34,8 @@ KWallet::Wallet* KNAccountManager::mWallet = 0; bool KNAccountManager::mWalletOpenFailed = false; -KNAccountManager::KNAccountManager(KNGroupManager *gm, TQObject * tqparent, const char * name) - : TQObject(tqparent, name), gManager(gm), c_urrentAccount(0), +KNAccountManager::KNAccountManager(KNGroupManager *gm, TQObject * parent, const char * name) + : TQObject(parent, name), gManager(gm), c_urrentAccount(0), mAsyncOpening( false ) { s_mtp = new KNServerInfo(); diff --git a/knode/knaccountmanager.h b/knode/knaccountmanager.h index 53f048b56..4b1227fc7 100644 --- a/knode/knaccountmanager.h +++ b/knode/knaccountmanager.h @@ -33,7 +33,7 @@ class KNAccountManager : public TQObject TQ_OBJECT public: - KNAccountManager(KNGroupManager *gm, TQObject * tqparent=0, const char * name=0); + KNAccountManager(KNGroupManager *gm, TQObject * parent=0, const char * name=0); ~KNAccountManager(); void prepareShutdown(); diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp index e871b1f5c..ab9c97eac 100644 --- a/knode/knarticlemanager.cpp +++ b/knode/knarticlemanager.cpp @@ -74,21 +74,21 @@ void KNArticleManager::deleteTempFiles() } -void KNArticleManager::saveContentToFile(KMime::Content *c, TQWidget *tqparent) +void KNArticleManager::saveContentToFile(KMime::Content *c, TQWidget *parent) { - KNSaveHelper helper(c->contentType()->name(),tqparent); + KNSaveHelper helper(c->contentType()->name(),parent); TQFile *file = helper.getFile(i18n("Save Attachment")); if (file) { TQByteArray data=c->decodedContent(); if (file->writeBlock(data.data(), data.size()) == -1 ) - KNHelper::displayExternalFileError( tqparent ); + KNHelper::displayExternalFileError( parent ); } } -void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *tqparent) +void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *parent) { TQString fName = a->subject()->asUnicodeString(); TQString s = ""; @@ -101,13 +101,13 @@ void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *tqparent) fName = s.simplifyWhiteSpace(); fName.replace(TQRegExp("[\\s]"),"_"); - KNSaveHelper helper(fName,tqparent); + KNSaveHelper helper(fName,parent); TQFile *file = helper.getFile(i18n("Save Article")); if (file) { TQCString tmp=a->encodedContent(false); if ( file->writeBlock(tmp.data(), tmp.size()) == -1 ) - KNHelper::displayExternalFileError( tqparent ); + KNHelper::displayExternalFileError( parent ); } } @@ -272,7 +272,7 @@ void KNArticleManager::showHdrs(bool clear) } - if (current && !current->filterResult()) { // try to find a tqparent that is visible + if (current && !current->filterResult()) { // try to find a parent that is visible int idRef; while (current && !current->filterResult()) { idRef=current->idRef(); diff --git a/knode/knarticlemanager.h b/knode/knarticlemanager.h index 08423cf84..7b0525614 100644 --- a/knode/knarticlemanager.h +++ b/knode/knarticlemanager.h @@ -47,8 +47,8 @@ class KNArticleManager : public TQObject, public KNJobConsumer { //content handling void deleteTempFiles(); - void saveContentToFile(KMime::Content *c, TQWidget *tqparent); - void saveArticleToFile(KNArticle *a, TQWidget *tqparent); + void saveContentToFile(KMime::Content *c, TQWidget *parent); + void saveArticleToFile(KNArticle *a, TQWidget *parent); TQString saveContentToTemp(KMime::Content *c); void openContent(KMime::Content *c); diff --git a/knode/kncollection.h b/knode/kncollection.h index 697021c42..f6c4b9150 100644 --- a/knode/kncollection.h +++ b/knode/kncollection.h @@ -45,8 +45,8 @@ class KNCollection { virtual bool readInfo(const TQString &confPath)=0; virtual void saveInfo()=0; - // tqparent - KNCollection* tqparent()const { return p_arent; } + // parent + KNCollection* parent()const { return p_arent; } virtual void setParent(KNCollection *p) { p_arent=p; } // name diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 1026e642d..7b73cc7ba 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -32,8 +32,8 @@ #include "kncollectionview.h" #include "kncollectionviewitem.h" -KNCollectionView::KNCollectionView(TQWidget *tqparent, const char* name) : - KFolderTree(tqparent, name), +KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) : + KFolderTree(parent, name), mActiveItem( 0 ), mPopup( 0 ) { @@ -221,13 +221,13 @@ void KNCollectionView::addFolder(KNFolder *f) { KNCollectionViewItem *it; - if (!f->tqparent()) { + if (!f->parent()) { // root folder it = new KNCollectionViewItem(this, KFolderTreeItem::Local); } else { - // make sure the tqparent folder has already been added - if (!f->tqparent()->listItem()) - addFolder( static_cast<KNFolder*>(f->tqparent()) ); + // make sure the parent folder has already been added + if (!f->parent()->listItem()) + addFolder( static_cast<KNFolder*>(f->parent()) ); // handle special folders KFolderTreeItem::Type type = KFolderTreeItem::Other; switch ( f->id() ) { @@ -238,7 +238,7 @@ void KNCollectionView::addFolder(KNFolder *f) case 3: type = KFolderTreeItem::SentMail; break; } - it = new KNCollectionViewItem( f->tqparent()->listItem(), KFolderTreeItem::Local, type ); + it = new KNCollectionViewItem( f->parent()->listItem(), KFolderTreeItem::Local, type ); } f->setListItem( it ); updateFolder( f ); diff --git a/knode/kncollectionview.h b/knode/kncollectionview.h index fe25618f7..c48b7f442 100644 --- a/knode/kncollectionview.h +++ b/knode/kncollectionview.h @@ -30,7 +30,7 @@ class KNCollectionView : public KFolderTree { TQ_OBJECT public: - KNCollectionView(TQWidget *tqparent, const char *name = 0); + KNCollectionView(TQWidget *parent, const char *name = 0); ~KNCollectionView(); void setActive(TQListViewItem *item); diff --git a/knode/kncollectionviewitem.cpp b/knode/kncollectionviewitem.cpp index 245ea7778..4c1f4b7a2 100644 --- a/knode/kncollectionviewitem.cpp +++ b/knode/kncollectionviewitem.cpp @@ -32,8 +32,8 @@ #include "knconfigmanager.h" -KNCollectionViewItem::KNCollectionViewItem( KFolderTree *tqparent, Protocol protocol, Type type) : - KFolderTreeItem(tqparent, TQString(), protocol, type), coll(0) +KNCollectionViewItem::KNCollectionViewItem( KFolderTree *parent, Protocol protocol, Type type) : + KFolderTreeItem(parent, TQString(), protocol, type), coll(0) { setIcon(); } @@ -137,7 +137,7 @@ void KNCollectionViewItem::paintCell( TQPainter * p, const TQColorGroup & cg,int if (px) pxWidth += px->width(); - // temporary set the squeezed text and use the tqparent class to paint it + // temporary set the squeezed text and use the parent class to paint it TQString curText = text( column ); if ( p->fontMetrics().width( curText ) > width - pxWidth ) { setText( column, squeezeFolderName( curText, p->fontMetrics(), width - pxWidth ) ); diff --git a/knode/kncollectionviewitem.h b/knode/kncollectionviewitem.h index 14381a290..4f343147c 100644 --- a/knode/kncollectionviewitem.h +++ b/knode/kncollectionviewitem.h @@ -28,8 +28,8 @@ class KNCollection; class KNCollectionViewItem : public KFolderTreeItem { public: - KNCollectionViewItem( KFolderTree *tqparent, Protocol protocol = NONE, Type type = Root); - KNCollectionViewItem( KFolderTreeItem *tqparent, Protocol protocol = NONE, + KNCollectionViewItem( KFolderTree *parent, Protocol protocol = NONE, Type type = Root); + KNCollectionViewItem( KFolderTreeItem *parent, Protocol protocol = NONE, Type type = Other, int unread = 0, int total = 0 ); ~KNCollectionViewItem(); diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 60564d39d..af9132d70 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -63,8 +63,8 @@ using KRecentAddress::RecentAddresses; #include <kstdguiitem.h> KNLineEdit::KNLineEdit(KNComposer::ComposerView *_composerView, bool useCompletion, - TQWidget *tqparent, const char *name) - : KNLineEditInherited(tqparent,useCompletion,name) , composerView(_composerView) + TQWidget *parent, const char *name) + : KNLineEditInherited(parent,useCompletion,name) , composerView(_composerView) { } @@ -131,8 +131,8 @@ void KNLineEdit::keyPressEvent(TQKeyEvent *e) KNLineEditInherited::keyPressEvent(e); } -KNLineEditSpell::KNLineEditSpell( KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * tqparent, const char * name) - :KNLineEdit( _composerView, useCompletion, tqparent,name ) +KNLineEditSpell::KNLineEditSpell( KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * parent, const char * name) + :KNLineEdit( _composerView, useCompletion, parent,name ) { } @@ -1744,7 +1744,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(l_to, 0,0); hdrL->addWidget(t_o, 0,1); hdrL->addWidget(t_oBtn, 0,2); - connect(t_oBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotToBtnClicked())); + connect(t_oBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotToBtnClicked())); //Newsgroups g_roups=new KNLineEdit(this, false, hdrFrame); @@ -1756,8 +1756,8 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(g_roups, 1,1); hdrL->addWidget(g_roupsBtn, 1,2); connect(g_roups, TQT_SIGNAL(textChanged(const TQString&)), - tqparent(), TQT_SLOT(slotGroupsChanged(const TQString&))); - connect(g_roupsBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotGroupsBtnClicked())); + parent(), TQT_SLOT(slotGroupsChanged(const TQString&))); + connect(g_roupsBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotGroupsBtnClicked())); //Followup-To f_up2=new KComboBox(true, hdrFrame); @@ -1773,7 +1773,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(l, 3,0); hdrL->addMultiCellWidget(s_ubject, 3,3, 1,2); connect(s_ubject, TQT_SIGNAL(textChanged(const TQString&)), - tqparent(), TQT_SLOT(slotSubjectChanged(const TQString&))); + parent(), TQT_SLOT(slotSubjectChanged(const TQString&))); //Editor e_dit=new Editor(this, composer, main); @@ -1907,32 +1907,32 @@ void KNComposer::ComposerView::showAttachmentView() //connections connect(a_ttView, TQT_SIGNAL(currentChanged(TQListViewItem*)), - tqparent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); + parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); connect(a_ttView, TQT_SIGNAL(clicked ( TQListViewItem * )), - tqparent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); + parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); connect(a_ttView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - tqparent(), TQT_SLOT(slotAttachmentPopup(KListView*, TQListViewItem*, const TQPoint&))); + parent(), TQT_SLOT(slotAttachmentPopup(KListView*, TQListViewItem*, const TQPoint&))); connect(a_ttView, TQT_SIGNAL(delPressed(TQListViewItem*)), - tqparent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*))); + parent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*))); connect(a_ttView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - tqparent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); + parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); connect(a_ttView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - tqparent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); + parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); //buttons a_ttAddBtn=new TQPushButton(i18n("A&dd..."),a_ttWidget); - connect(a_ttAddBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotAttachFile())); + connect(a_ttAddBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachFile())); topL->addWidget(a_ttAddBtn, 0,1); a_ttRemoveBtn=new TQPushButton(i18n("&Remove"), a_ttWidget); a_ttRemoveBtn->setEnabled(false); - connect(a_ttRemoveBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotRemoveAttachment())); + connect(a_ttRemoveBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotRemoveAttachment())); topL->addWidget(a_ttRemoveBtn, 1,1); a_ttEditBtn=new TQPushButton(i18n("&Properties"), a_ttWidget); a_ttEditBtn->setEnabled(false); - connect(a_ttEditBtn, TQT_SIGNAL(clicked()), tqparent(), TQT_SLOT(slotAttachmentProperties())); + connect(a_ttEditBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachmentProperties())); topL->addWidget(a_ttEditBtn, 2,1, TQt::AlignTop); topL->setRowStretch(2,1); @@ -1991,8 +1991,8 @@ void KNComposer::ComposerView::hideExternalNotification() //===================================================================================== #include <kcursor.h> -KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *tqparent, char *name) - : KEdit(tqparent, name), m_composer( _composer ), m_composerView(_composerView) +KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *parent, char *name) + : KEdit(parent, name), m_composer( _composer ), m_composerView(_composerView) { setOverwriteEnabled(true); spell = 0L; @@ -2490,8 +2490,8 @@ void KNComposer::Editor::slotCorrectWord() //===================================================================================== -KNComposer::AttachmentView::AttachmentView(TQWidget *tqparent, char *name) - : KListView(tqparent, name) +KNComposer::AttachmentView::AttachmentView(TQWidget *parent, char *name) + : KListView(parent, name) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); // match the TQMultiLineEdit style addColumn(i18n("File"), 115); diff --git a/knode/kncomposer.h b/knode/kncomposer.h index 83b406bed..d4a4c2a87 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -255,7 +255,7 @@ class KNComposer::Editor : public KEdit { TQ_OBJECT public: - Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *tqparent=0, char *name=0); + Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *parent=0, char *name=0); ~Editor(); TQStringList processedText(); @@ -308,7 +308,7 @@ class KNComposer::AttachmentView : public KListView { TQ_OBJECT public: - AttachmentView(TQWidget *tqparent, char *name=0); + AttachmentView(TQWidget *parent, char *name=0); ~AttachmentView(); protected: @@ -362,10 +362,10 @@ class KNLineEdit : public KABC::AddressLineEdit typedef KABC::AddressLineEdit KNLineEditInherited; public: - KNLineEdit(KNComposer::ComposerView *_composerView, bool useCompletion, TQWidget *tqparent = 0, + KNLineEdit(KNComposer::ComposerView *_composerView, bool useCompletion, TQWidget *parent = 0, const char *name = 0); protected: - // Inherited. Always called by the tqparent when this widget is created. + // Inherited. Always called by the parent when this widget is created. virtual void loadAddresses(); void keyPressEvent(TQKeyEvent *e); virtual TQPopupMenu *createPopupMenu(); @@ -380,7 +380,7 @@ class KNLineEditSpell : public KNLineEdit Q_OBJECT TQ_OBJECT public: - KNLineEditSpell(KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * tqparent, const char * name = 0); + KNLineEditSpell(KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * parent, const char * name = 0); void highLightWord( unsigned int length, unsigned int pos ); void spellCheckDone( const TQString &s ); void spellCheckerMisspelling( const TQString &text, const TQStringList &, unsigned int pos); diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index fa0593c27..030838acb 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -28,8 +28,8 @@ // // common config page with tabs (code mostly taken from kmail) // -KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * tqparent, const char * name ) - : KCModule( tqparent, name ) +KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * parent, const char * name ) + : KCModule( parent, name ) { TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mTabWidget = new TQTabWidget( this ); @@ -72,11 +72,11 @@ void KNConfig::BasePageWithTabs::defaults() { // extern "C" { - KDE_EXPORT KCModule *create_knode_config_identity( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_knode_config_identity( TQWidget *parent, const char * ) { KNConfig::IdentityWidget *page = new KNConfig::IdentityWidget( knGlobals.configManager()->identity(), - tqparent, + parent, "kcmknode_config_identity" ); return page; } @@ -89,15 +89,15 @@ extern "C" // extern "C" { - KCModule *create_knode_config_accounts( TQWidget *tqparent, const char * ) + KCModule *create_knode_config_accounts( TQWidget *parent, const char * ) { - KNConfig::AccountsPage *page = new KNConfig::AccountsPage( tqparent, "kcmknode_config_accounts" ); + KNConfig::AccountsPage *page = new KNConfig::AccountsPage( parent, "kcmknode_config_accounts" ); return page; } } -KNConfig::AccountsPage::AccountsPage(TQWidget *tqparent, const char *name) - : BasePageWithTabs(tqparent, name) { +KNConfig::AccountsPage::AccountsPage(TQWidget *parent, const char *name) + : BasePageWithTabs(parent, name) { addTab(new KNConfig::NntpAccountListWidget(this), i18n("Newsgroup Servers")); addTab(new KNConfig::SmtpAccountWidget(this), i18n("Mail Server (SMTP)")); @@ -110,9 +110,9 @@ KNConfig::AccountsPage::AccountsPage(TQWidget *tqparent, const char *name) // extern "C" { - KCModule *create_knode_config_appearance( TQWidget *tqparent, const char * ) + KCModule *create_knode_config_appearance( TQWidget *parent, const char * ) { - KNConfig::AppearanceWidget *page = new KNConfig::AppearanceWidget( tqparent, "kcmknode_config_appearance" ); + KNConfig::AppearanceWidget *page = new KNConfig::AppearanceWidget( parent, "kcmknode_config_appearance" ); return page; } } @@ -124,15 +124,15 @@ extern "C" // extern "C" { - KCModule *create_knode_config_read_news( TQWidget *tqparent, const char * ) + KCModule *create_knode_config_read_news( TQWidget *parent, const char * ) { - KNConfig::ReadNewsPage *page = new KNConfig::ReadNewsPage( tqparent, "kcmknode_config_read_news" ); + KNConfig::ReadNewsPage *page = new KNConfig::ReadNewsPage( parent, "kcmknode_config_read_news" ); return page; } } -KNConfig::ReadNewsPage::ReadNewsPage(TQWidget *tqparent, const char *name) - : BasePageWithTabs(tqparent, name) { +KNConfig::ReadNewsPage::ReadNewsPage(TQWidget *parent, const char *name) + : BasePageWithTabs(parent, name) { KNConfigManager *cfgMgr = knGlobals.configManager(); addTab(new KNConfig::ReadNewsGeneralWidget(cfgMgr->readNewsGeneral(), this), i18n("General")); @@ -150,15 +150,15 @@ KNConfig::ReadNewsPage::ReadNewsPage(TQWidget *tqparent, const char *name) // extern "C" { - KCModule *create_knode_config_post_news( TQWidget *tqparent, const char * ) + KCModule *create_knode_config_post_news( TQWidget *parent, const char * ) { - KNConfig::PostNewsPage *page = new KNConfig::PostNewsPage( tqparent, "kcmknode_config_post_news" ); + KNConfig::PostNewsPage *page = new KNConfig::PostNewsPage( parent, "kcmknode_config_post_news" ); return page; } } -KNConfig::PostNewsPage::PostNewsPage(TQWidget *tqparent, const char *name) - : BasePageWithTabs(tqparent, name) { +KNConfig::PostNewsPage::PostNewsPage(TQWidget *parent, const char *name) + : BasePageWithTabs(parent, name) { KNConfigManager *cfgMgr = knGlobals.configManager(); addTab(new KNConfig::PostNewsTechnicalWidget(cfgMgr->postNewsTechnical(), this), i18n("Technical")); @@ -173,9 +173,9 @@ KNConfig::PostNewsPage::PostNewsPage(TQWidget *tqparent, const char *name) // extern "C" { - KCModule *create_knode_config_privacy( TQWidget *tqparent, const char * ) + KCModule *create_knode_config_privacy( TQWidget *parent, const char * ) { - KNConfig::PrivacyWidget *page = new KNConfig::PrivacyWidget( tqparent, "kcmknode_config_privacy" ); + KNConfig::PrivacyWidget *page = new KNConfig::PrivacyWidget( parent, "kcmknode_config_privacy" ); return page; } } @@ -187,9 +187,9 @@ extern "C" // extern "C" { - KCModule *create_knode_config_cleanup( TQWidget *tqparent, const char * ) + KCModule *create_knode_config_cleanup( TQWidget *parent, const char * ) { - KNConfig::CleanupWidget *page = new KNConfig::CleanupWidget( tqparent, "kcmknode_config_cleanup" ); + KNConfig::CleanupWidget *page = new KNConfig::CleanupWidget( parent, "kcmknode_config_cleanup" ); return page; } } diff --git a/knode/knconfigpages.h b/knode/knconfigpages.h index 3f009c1d8..5479d3c8a 100644 --- a/knode/knconfigpages.h +++ b/knode/knconfigpages.h @@ -33,7 +33,7 @@ class KDE_EXPORT BasePageWithTabs : public KCModule { Q_OBJECT TQ_OBJECT public: - BasePageWithTabs( TQWidget * tqparent=0, const char * name=0 ); + BasePageWithTabs( TQWidget * parent=0, const char * name=0 ); ~BasePageWithTabs() {}; virtual void load(); @@ -55,7 +55,7 @@ class AccountsPage : public BasePageWithTabs { TQ_OBJECT public: - AccountsPage(TQWidget *tqparent = 0, const char *name = 0); + AccountsPage(TQWidget *parent = 0, const char *name = 0); }; @@ -65,7 +65,7 @@ class KDE_EXPORT ReadNewsPage : public BasePageWithTabs { TQ_OBJECT public: - ReadNewsPage(TQWidget *tqparent = 0, const char *name = 0); + ReadNewsPage(TQWidget *parent = 0, const char *name = 0); }; // post news page @@ -74,7 +74,7 @@ class KDE_EXPORT PostNewsPage : public BasePageWithTabs { TQ_OBJECT public: - PostNewsPage(TQWidget *tqparent = 0, const char *name = 0); + PostNewsPage(TQWidget *parent = 0, const char *name = 0); }; diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index a915fe17f..0860ee05e 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -2360,8 +2360,8 @@ void KNConfig::PrivacyWidget::save() //BEGIN: Cleanup configuration widgets --------------------------------------- -KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mData( data ) +KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mData( data ) { TQVBoxLayout *top = new TQVBoxLayout( this ); diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h index 806f6b822..adaec6136 100644 --- a/knode/knconfigwidgets.h +++ b/knode/knconfigwidgets.h @@ -658,7 +658,7 @@ class KDE_EXPORT GroupCleanupWidget : public TQWidget { TQ_OBJECT public: - GroupCleanupWidget( Cleanup *data, TQWidget *tqparent = 0, const char *name = 0 ); + GroupCleanupWidget( Cleanup *data, TQWidget *parent = 0, const char *name = 0 ); void load(); void save(); diff --git a/knode/knfilterconfigwidget.cpp b/knode/knfilterconfigwidget.cpp index f3870c1b0..a345e93f9 100644 --- a/knode/knfilterconfigwidget.cpp +++ b/knode/knfilterconfigwidget.cpp @@ -25,8 +25,8 @@ #include "knfilterconfigwidget.h" -KNFilterConfigWidget::KNFilterConfigWidget(TQWidget *tqparent, const char *name ) : - TQTabWidget(tqparent,name) +KNFilterConfigWidget::KNFilterConfigWidget(TQWidget *parent, const char *name ) : + TQTabWidget(parent,name) { TQWidget *sf, *idW, *add; sf=new TQWidget(this); diff --git a/knode/knfilterconfigwidget.h b/knode/knfilterconfigwidget.h index 94a100d74..b0903a0c3 100644 --- a/knode/knfilterconfigwidget.h +++ b/knode/knfilterconfigwidget.h @@ -33,7 +33,7 @@ class KNFilterConfigWidget : public TQTabWidget { friend class KNSearchDialog; public: - KNFilterConfigWidget(TQWidget *tqparent=0, const char *name=0); + KNFilterConfigWidget(TQWidget *parent=0, const char *name=0); ~KNFilterConfigWidget(); void reset(); diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index 399c0078b..ea05a21cc 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -30,9 +30,9 @@ #include "knfilterdialog.h" -KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *tqparent, const char *name) +KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char *name) : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").tqarg(f->name()), - Ok|Cancel|Help, Ok, tqparent, name), + Ok|Cancel|Help, Ok, parent, name), fltr(f) { TQFrame* page=plainPage(); diff --git a/knode/knfilterdialog.h b/knode/knfilterdialog.h index 69e5c45d9..875217c94 100644 --- a/knode/knfilterdialog.h +++ b/knode/knfilterdialog.h @@ -34,7 +34,7 @@ class KNFilterDialog : public KDialogBase { friend class KNFilterManager; public: - KNFilterDialog(KNArticleFilter *f=0, TQWidget *tqparent=0, const char *name=0); + KNFilterDialog(KNArticleFilter *f=0, TQWidget *parent=0, const char *name=0); ~KNFilterDialog(); KNArticleFilter* filter() { return fltr; } diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index 67302063a..92fde5048 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -30,8 +30,8 @@ KNFilterSelectAction::KNFilterSelectAction( const TQString& text, const TQString& pix, - TQObject* tqparent, const char *name ) - : KActionMenu(text,pix,tqparent,name), currentItem(-42) + TQObject* parent, const char *name ) + : KActionMenu(text,pix,parent,name), currentItem(-42) { popupMenu()->setCheckable(true); connect(popupMenu(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotMenuActivated(int))); @@ -61,8 +61,8 @@ void KNFilterSelectAction::slotMenuActivated(int id) //============================================================================== -KNFilterManager::KNFilterManager(TQObject * tqparent, const char * name) - : TQObject(tqparent,name), fset(0), currFilter(0), a_ctFilter(0) +KNFilterManager::KNFilterManager(TQObject * parent, const char * name) + : TQObject(parent,name), fset(0), currFilter(0), a_ctFilter(0) { loadFilters(); diff --git a/knode/knfiltermanager.h b/knode/knfiltermanager.h index c5c1f9748..b037514c9 100644 --- a/knode/knfiltermanager.h +++ b/knode/knfiltermanager.h @@ -35,7 +35,7 @@ class KNFilterSelectAction : public KActionMenu public: KNFilterSelectAction( const TQString& text, const TQString& pix, - TQObject* tqparent, const char *name ); + TQObject* parent, const char *name ); ~KNFilterSelectAction(); void setCurrentItem(int id); @@ -57,7 +57,7 @@ class KNFilterManager : public TQObject TQ_OBJECT public: - KNFilterManager(TQObject * tqparent = 0, const char * name = 0); + KNFilterManager(TQObject * parent = 0, const char * name = 0); ~KNFilterManager(); void readOptions(); diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp index 68a43dcea..58ac7d0fc 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -41,8 +41,8 @@ KNFolder::KNFolder() } -KNFolder::KNFolder(int id, const TQString &name, KNFolder *tqparent) - : KNArticleCollection(tqparent), i_d(id), i_ndexDirty(false), w_asOpen(true) +KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent) + : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true) { TQString fname=path()+TQString("custom_%1").tqarg(i_d); @@ -51,7 +51,7 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *tqparent) i_ndexFile.setName(fname+".idx"); i_nfoPath=fname+".info"; - p_arentId=tqparent?tqparent->id():-1; + p_arentId=parent?parent->id():-1; if(i_ndexFile.exists()) c_ount=i_ndexFile.size()/sizeof(DynData); @@ -60,8 +60,8 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *tqparent) } -KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *tqparent) - : KNArticleCollection(tqparent), i_d(id), i_ndexDirty(false), w_asOpen(true) +KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *parent) + : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true) { TQString fname=path()+TQString("%1_%2").tqarg(prefix).tqarg(i_d); @@ -70,7 +70,7 @@ KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolde i_ndexFile.setName(fname+".idx"); i_nfoPath=fname+".info"; - p_arentId=tqparent?tqparent->id():-1; + p_arentId=parent?parent->id():-1; if(i_ndexFile.exists()) c_ount=i_ndexFile.size()/sizeof(DynData); diff --git a/knode/knfolder.h b/knode/knfolder.h index 632dbc6e5..0be6dafde 100644 --- a/knode/knfolder.h +++ b/knode/knfolder.h @@ -28,8 +28,8 @@ class KNFolder : public KNArticleCollection { public: KNFolder(); - KNFolder(int id, const TQString &name, KNFolder *tqparent=0); - KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *tqparent=0); + KNFolder(int id, const TQString &name, KNFolder *parent=0); + KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *parent=0); ~KNFolder(); //type @@ -58,7 +58,7 @@ class KNFolder : public KNArticleCollection { KNLocalArticle* byMessageId(const TQCString &mid) { return static_cast<KNLocalArticle*>(KNArticleCollection::byMessageId(mid)); } - //tqparent + //parent void setParent(KNCollection *p); //load, save and delete diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp index bdac2f2b9..7041f4562 100644 --- a/knode/knfoldermanager.cpp +++ b/knode/knfoldermanager.cpp @@ -156,7 +156,7 @@ bool KNFolderManager::deleteFolder(KNFolder *f) // find all subfolders of the folder we want to delete for ( TQValueList<KNFolder*>::Iterator it = mFolderList.begin(); it != mFolderList.end(); ++it ) { - p = (*it)->tqparent(); + p = (*it)->parent(); while ( p ) { if ( p == f ) { if ( (*it)->lockedArticles() > 0 ) @@ -164,7 +164,7 @@ bool KNFolderManager::deleteFolder(KNFolder *f) del.append( (*it) ); break; } - p = p->tqparent(); + p = p->parent(); } } @@ -198,15 +198,15 @@ void KNFolderManager::emptyFolder(KNFolder *f) bool KNFolderManager::moveFolder(KNFolder *f, KNFolder *p) { - if(!f || p==f->tqparent()) // nothing to be done + if(!f || p==f->parent()) // nothing to be done return true; // is "p" a child of "f" ? - KNCollection *p2=p?p->tqparent():0; + KNCollection *p2=p?p->parent():0; while(p2) { if(p2==f) break; - p2=p2->tqparent(); + p2=p2->parent(); } if( (p2 && p2==f) || f==p || f->isStandardFolder() || f->isRootFolder()) // no way ;-) @@ -466,7 +466,7 @@ int KNFolderManager::loadCustomFolders() // 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 + if ( !(*it)->isRootFolder() ) { // the root folder has no parent KNFolder *par = folder( (*it)->parentId() ); if ( !par ) par = root(); diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index a6b3e6619..df40915f2 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -167,8 +167,8 @@ void KNGroup::saveInfo() KNNntpAccount* KNGroup::account() { - KNCollection *p=tqparent(); - while(p->type()!=KNCollection::CTnntpAccount) p=p->tqparent(); + KNCollection *p=parent(); + while(p->type()!=KNCollection::CTnntpAccount) p=p->parent(); return (KNNntpAccount*)p_arent; } diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index 584eae40c..a3bcb89f4 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -34,9 +34,9 @@ #include <tqpushbutton.h> -KNGroupBrowser::KNGroupBrowser(TQWidget *tqparent, const TQString &caption, KNNntpAccount *a, +KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntpAccount *a, int buttons, bool newCBact, const TQString &user1, const TQString &user2) : - KDialogBase( tqparent, 0L, true, caption, buttons | Help | Ok | Cancel, Ok, true, user1, user2 ), + KDialogBase( parent, 0L, true, caption, buttons | Help | Ok | Cancel, Ok, true, user1, user2 ), incrementalFilter(false), a_ccount(a) { refilterTimer = new TQTimer(); @@ -190,7 +190,7 @@ bool KNGroupBrowser::itemInListView(TQListView *view, const KNGroupInfo &gi) } -void KNGroupBrowser::createListItems(TQListViewItem *tqparent) +void KNGroupBrowser::createListItems(TQListViewItem *parent) { TQString prefix, tlgn, compare; TQListViewItem *it; @@ -198,11 +198,11 @@ void KNGroupBrowser::createListItems(TQListViewItem *tqparent) int colon; bool expandit=false; - if(tqparent) { - TQListViewItem *p=tqparent; + if(parent) { + TQListViewItem *p=parent; while(p) { prefix.prepend(p->text(0)); - p=p->tqparent(); + p=p->parent(); } } @@ -228,8 +228,8 @@ void KNGroupBrowser::createListItems(TQListViewItem *tqparent) tlgn = compare.left(colon); if(expandit) { - if(tqparent) - it=new TQListViewItem(tqparent, tlgn); + if(parent) + it=new TQListViewItem(parent, tlgn); else it=new TQListViewItem(groupView, tlgn); @@ -237,8 +237,8 @@ void KNGroupBrowser::createListItems(TQListViewItem *tqparent) it->setExpandable(true); } else { - if(tqparent) - cit=new CheckItem(tqparent, *gn, this); + if(parent) + cit=new CheckItem(parent, *gn, this); else cit=new CheckItem(groupView, *gn, this); updateItemState(cit); diff --git a/knode/kngroupbrowser.h b/knode/kngroupbrowser.h index 4a32d6278..65bbb293d 100644 --- a/knode/kngroupbrowser.h +++ b/knode/kngroupbrowser.h @@ -63,7 +63,7 @@ class KNGroupBrowser : public KDialogBase { KNGroupInfo info; }; - KNGroupBrowser(TQWidget *tqparent, const TQString &caption, KNNntpAccount *a, int buttons=0, + KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntpAccount *a, int buttons=0, bool newCBact=false, const TQString &user1=TQString(), const TQString &user2=TQString()); ~KNGroupBrowser(); @@ -81,7 +81,7 @@ class KNGroupBrowser : public KDialogBase { void changeItemState(const KNGroupInfo &gi, bool s); bool itemInListView(TQListView *view, const KNGroupInfo &gi); void removeListItem(TQListView *view, const KNGroupInfo &gi); - void createListItems(TQListViewItem *tqparent=0); + void createListItems(TQListViewItem *parent=0); TQWidget *page; TQListView *groupView; diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 8265be68c..0050e96a5 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -34,8 +34,8 @@ #include <tqpushbutton.h> -KNGroupDialog::KNGroupDialog(TQWidget *tqparent, KNNntpAccount *a) : - KNGroupBrowser(tqparent, i18n("Subscribe to Newsgroups"),a, User1 | User2, true, i18n("New &List"), i18n("New &Groups...") ) +KNGroupDialog::KNGroupDialog(TQWidget *parent, KNNntpAccount *a) : + KNGroupBrowser(parent, i18n("Subscribe to Newsgroups"),a, User1 | User2, true, i18n("New &List"), i18n("New &Groups...") ) { rightLabel->setText(i18n("Current changes:")); subView=new TQListView(page); diff --git a/knode/kngroupdialog.h b/knode/kngroupdialog.h index 024e67078..625f2c071 100644 --- a/knode/kngroupdialog.h +++ b/knode/kngroupdialog.h @@ -26,7 +26,7 @@ class KNGroupDialog : public KNGroupBrowser { TQ_OBJECT public: - KNGroupDialog(TQWidget *tqparent, KNNntpAccount *a); + KNGroupDialog(TQWidget *parent, KNNntpAccount *a); ~KNGroupDialog(); void toSubscribe(TQSortedList<KNGroupInfo> *l); diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index c0677a0ad..dd8b05961 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -224,8 +224,8 @@ TQSortedList<KNGroupInfo>* KNGroupListData::extractList() //=============================================================================== -KNGroupManager::KNGroupManager(TQObject * tqparent, const char * name) - : TQObject(tqparent,name) +KNGroupManager::KNGroupManager(TQObject * parent, const char * name) + : TQObject(parent,name) { c_urrentGroup=0; a_rticleMgr = knGlobals.articleManager(); @@ -393,9 +393,9 @@ void KNGroupManager::expireAll(KNNntpAccount *a) } -void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *tqparent) +void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent) { - KNGroupDialog* gDialog=new KNGroupDialog((tqparent!=0)? tqparent:knGlobals.topWidget, a); + KNGroupDialog* gDialog=new KNGroupDialog((parent!=0)? parent:knGlobals.topWidget, a); connect(gDialog, TQT_SIGNAL(loadList(KNNntpAccount*)), this, TQT_SLOT(slotLoadGroupList(KNNntpAccount*))); connect(gDialog, TQT_SIGNAL(fetchList(KNNntpAccount*)), this, TQT_SLOT(slotFetchGroupList(KNNntpAccount*))); @@ -408,7 +408,7 @@ void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *tqparent) TQStringList lst; gDialog->toUnsubscribe(&lst); if (lst.count()>0) { - if (KMessageBox::Yes == KMessageBox::questionYesNoList((tqparent!=0)? tqparent:knGlobals.topWidget,i18n("Do you really want to unsubscribe\nfrom these groups?"), + if (KMessageBox::Yes == KMessageBox::questionYesNoList((parent!=0)? parent:knGlobals.topWidget,i18n("Do you really want to unsubscribe\nfrom these groups?"), lst, TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel())) { for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if((g=group(*it, a))) diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h index 4105e7cd9..8b34979d6 100644 --- a/knode/kngroupmanager.h +++ b/knode/kngroupmanager.h @@ -82,7 +82,7 @@ class KNGroupManager : public TQObject , public KNJobConsumer { public: - KNGroupManager(TQObject * tqparent=0, const char * name=0); + KNGroupManager(TQObject * parent=0, const char * name=0); ~KNGroupManager(); // group access @@ -100,7 +100,7 @@ class KNGroupManager : public TQObject , public KNJobConsumer { void setCurrentGroup(KNGroup *g); // group handling - void showGroupDialog(KNNntpAccount *a, TQWidget *tqparent=0); + void showGroupDialog(KNNntpAccount *a, TQWidget *parent=0); void subscribeGroup(const KNGroupInfo *gi, KNNntpAccount *a); bool unsubscribeGroup(KNGroup *g=0); void showGroupProperties(KNGroup *g=0); diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index d5cd71755..264a9444f 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -29,9 +29,9 @@ #include <tqlabel.h> -KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *tqparent, const char *name ) +KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *name ) : KDialogBase(Tabbed, i18n("Properties of %1").tqarg(group->groupname()), - Ok|Cancel|Help, Ok, tqparent, name), + Ok|Cancel|Help, Ok, parent, name), g_rp(group), n_ickChanged(false) { diff --git a/knode/kngrouppropdlg.h b/knode/kngrouppropdlg.h index eb087dd45..0c640bea6 100644 --- a/knode/kngrouppropdlg.h +++ b/knode/kngrouppropdlg.h @@ -35,7 +35,7 @@ namespace KNConfig { class KNGroupPropDlg : public KDialogBase { public: - KNGroupPropDlg(KNGroup *group, TQWidget *tqparent=0, const char *name=0); + KNGroupPropDlg(KNGroup *group, TQWidget *parent=0, const char *name=0); ~KNGroupPropDlg(); bool nickHasChanged()const { return n_ickChanged; } diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index bfd374060..6767d3f64 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -27,8 +27,8 @@ #include <tqpushbutton.h> -KNGroupSelectDialog::KNGroupSelectDialog(TQWidget *tqparent, KNNntpAccount *a, const TQString &act) : - KNGroupBrowser(tqparent, i18n("Select Destinations"), a) +KNGroupSelectDialog::KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, const TQString &act) : + KNGroupBrowser(parent, i18n("Select Destinations"), a) { selView=new TQListView(page); selView->addColumn(TQString()); diff --git a/knode/kngroupselectdialog.h b/knode/kngroupselectdialog.h index 05b21970f..a2d9e0163 100644 --- a/knode/kngroupselectdialog.h +++ b/knode/kngroupselectdialog.h @@ -26,7 +26,7 @@ class KNGroupSelectDialog : public KNGroupBrowser { TQ_OBJECT public: - KNGroupSelectDialog(TQWidget *tqparent, KNNntpAccount *a, const TQString &act); + KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, const TQString &act); ~KNGroupSelectDialog(); TQString selectedGroups()const; diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 2214cb836..4294f7a51 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -70,9 +70,9 @@ using namespace KNode; KNGlobals knGlobals; -KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* tqparent, +KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* parent, const char* name ) - : DCOPObject("KNodeIface"), KDockArea( tqparent, name ), + : DCOPObject("KNodeIface"), KDockArea( parent, name ), b_lockui( false ), m_GUIClient( client ) { knGlobals.top=this; @@ -983,8 +983,8 @@ void KNMainWidget::closeCurrentThread() { TQListViewItem *item = h_drView->currentItem(); if (item) { - while (item->tqparent()) - item = item->tqparent(); + while (item->parent()) + item = item->parent(); h_drView->setCurrentItem(item); item->setOpen(false); h_drView->ensureItemVisible(item); @@ -2043,8 +2043,8 @@ KXMLGUIFactory* KNMainWidget::factory() const //-------------------------------- -FetchArticleIdDlg::FetchArticleIdDlg(TQWidget *tqparent, const char */*name*/ ) - :KDialogBase(tqparent, 0, true, i18n("Fetch Article with ID"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok) +FetchArticleIdDlg::FetchArticleIdDlg(TQWidget *parent, const char */*name*/ ) + :KDialogBase(parent, 0, true, i18n("Fetch Article with ID"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok) { TQHBox *page = makeHBoxMainWidget(); diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index 1ddba4906..b41894900 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -65,7 +65,7 @@ class KDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface Q_OBJECT TQ_OBJECT public: - KNMainWidget( KXMLGUIClient *client, bool detachable, TQWidget* tqparent, const char* name ); + KNMainWidget( KXMLGUIClient *client, bool detachable, TQWidget* parent, const char* name ); ~KNMainWidget(); /** exit */ @@ -416,7 +416,7 @@ class FetchArticleIdDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - FetchArticleIdDlg(TQWidget *tqparent, const char */*name*/ ); + FetchArticleIdDlg(TQWidget *parent, const char */*name*/ ); TQString messageId() const; protected slots: diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index bb32c04ff..ec2c86632 100644 --- a/knode/knnetaccess.cpp +++ b/knode/knnetaccess.cpp @@ -37,8 +37,8 @@ using KPIM::ProgressManager; -KNNetAccess::KNNetAccess(TQObject *tqparent, const char *name ) - : TQObject(tqparent,name), currentNntpJob(0), currentSmtpJob(0) +KNNetAccess::KNNetAccess(TQObject *parent, const char *name ) + : TQObject(parent,name), currentNntpJob(0), currentSmtpJob(0) { if ( pipe(nntpInPipe) == -1 || pipe(nntpOutPipe) == -1 ) { KMessageBox::error(knGlobals.topWidget, i18n("Internal error:\nFailed to open pipes for internal communication.")); diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h index e7ad1fb7e..6b34937a1 100644 --- a/knode/knnetaccess.h +++ b/knode/knnetaccess.h @@ -41,7 +41,7 @@ class KNNetAccess : public TQObject { public: - KNNetAccess(TQObject *tqparent=0, const char *name=0); + KNNetAccess(TQObject *parent=0, const char *name=0); ~KNNetAccess(); void addJob(KNJobData *job); diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp index 1795cbc58..81b3cc425 100644 --- a/knode/knnntpaccount.cpp +++ b/knode/knnntpaccount.cpp @@ -181,10 +181,10 @@ TQString KNNntpAccount::path() } -bool KNNntpAccount::editProperties(TQWidget *tqparent) +bool KNNntpAccount::editProperties(TQWidget *parent) { if(!i_dentity) i_dentity=new KNConfig::Identity(false); - KNConfig::NntpAccountConfDialog *d = new KNConfig::NntpAccountConfDialog(this, tqparent); + KNConfig::NntpAccountConfDialog *d = new KNConfig::NntpAccountConfDialog(this, parent); bool ret=false; if (d->exec()) { diff --git a/knode/knnntpaccount.h b/knode/knnntpaccount.h index a84d7a281..3625906fa 100644 --- a/knode/knnntpaccount.h +++ b/knode/knnntpaccount.h @@ -66,7 +66,7 @@ class KNNntpAccount : public KNCollection , public KNServerInfo { //void syncInfo(); TQString path(); /** returns true when the user accepted */ - bool editProperties(TQWidget *tqparent); + bool editProperties(TQWidget *parent); // news interval checking void startTimer(); diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index 1f95335e8..825de90c4 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -48,8 +48,8 @@ typedef KParts::GenericFactory< KNodePart > KNodeFactory; K_EXPORT_COMPONENT_FACTORY( libknodepart, KNodeFactory ) KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList &) - : KParts::ReadOnlyPart(tqparent, name), + TQObject *parent, const char *name, const TQStringList &) + : KParts::ReadOnlyPart(parent, name), mParentWidget( parentWidget ) { kdDebug(5003) << "KNodePart()" << endl; diff --git a/knode/knode_part.h b/knode/knode_part.h index e8883cb60..b0ed4afae 100644 --- a/knode/knode_part.h +++ b/knode/knode_part.h @@ -45,7 +45,7 @@ class KNodePart: public KParts::ReadOnlyPart TQ_OBJECT public: KNodePart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList &); + TQObject *parent, const char *name, const TQStringList &); virtual ~KNodePart(); TQWidget* parentWidget() const; diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp index 23b5753e8..28c67b030 100644 --- a/knode/knrangefilter.cpp +++ b/knode/knrangefilter.cpp @@ -96,8 +96,8 @@ void KNRangeFilter::save(KSimpleConfig *conf) //===================================================================================== //===================================================================================== -KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* tqparent, const TQString &unit) - : TQGroupBox(value, tqparent) +KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* parent, const TQString &unit) + : TQGroupBox(value, parent) { enabled=new TQCheckBox(this); diff --git a/knode/knrangefilter.h b/knode/knrangefilter.h index 5c05d4e72..8bf7d9504 100644 --- a/knode/knrangefilter.h +++ b/knode/knrangefilter.h @@ -66,7 +66,7 @@ class KNRangeFilterWidget : public TQGroupBox { TQ_OBJECT public: - KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* tqparent, const TQString &unit=TQString()); + KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* parent, const TQString &unit=TQString()); ~KNRangeFilterWidget(); KNRangeFilter filter(); diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp index 72e98dd1f..4344cbbab 100644 --- a/knode/knsearchdialog.cpp +++ b/knode/knsearchdialog.cpp @@ -29,8 +29,8 @@ #include "knsearchdialog.h" -KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *tqparent) - : TQDialog(tqparent) +KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent) + : TQDialog(parent) { setCaption(kapp->makeStdCaption( i18n("Search for Articles") )); setIcon(SmallIcon("knode")); diff --git a/knode/knsearchdialog.h b/knode/knsearchdialog.h index 784a855ef..f3c0647db 100644 --- a/knode/knsearchdialog.h +++ b/knode/knsearchdialog.h @@ -32,7 +32,7 @@ class KNSearchDialog : public TQDialog { public: enum searchType { STfolderSearch, STgroupSearch }; - KNSearchDialog(searchType t=STgroupSearch, TQWidget *tqparent=0); + KNSearchDialog(searchType t=STgroupSearch, TQWidget *parent=0); ~KNSearchDialog(); KNArticleFilter* filter() const { return f_ilter; } diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp index aa92dca58..a1379a265 100644 --- a/knode/knstatusfilter.cpp +++ b/knode/knstatusfilter.cpp @@ -94,8 +94,8 @@ bool KNStatusFilter::doFilter(KNRemoteArticle *a) //============================================================================== -KNStatusFilterWidget::KNStatusFilterWidget(TQWidget *tqparent) : - TQButtonGroup(0, tqparent) +KNStatusFilterWidget::KNStatusFilterWidget(TQWidget *parent) : + TQButtonGroup(0, parent) { setFrameStyle(NoFrame); enR=new TQCheckBox(i18n("Is read:"), this); @@ -197,7 +197,7 @@ void KNStatusFilterWidget::slotEnabled(int c) //============================================================================== -KNStatusFilterWidget::TFCombo::TFCombo(TQWidget *tqparent) : TQComboBox(tqparent) +KNStatusFilterWidget::TFCombo::TFCombo(TQWidget *parent) : TQComboBox(parent) { insertItem(i18n("True")); insertItem(i18n("False")); diff --git a/knode/knstatusfilter.h b/knode/knstatusfilter.h index f4ec92cdd..109e04557 100644 --- a/knode/knstatusfilter.h +++ b/knode/knstatusfilter.h @@ -57,7 +57,7 @@ class KNStatusFilterWidget : public TQButtonGroup { TQ_OBJECT public: - KNStatusFilterWidget(TQWidget *tqparent); + KNStatusFilterWidget(TQWidget *parent); ~KNStatusFilterWidget(); KNStatusFilter filter(); @@ -70,7 +70,7 @@ class KNStatusFilterWidget : public TQButtonGroup { class TFCombo : public TQComboBox { public: - TFCombo(TQWidget *tqparent); + TFCombo(TQWidget *parent); ~TFCombo(); void setValue(bool b) { if(b) setCurrentItem(0); else setCurrentItem(1); } bool value() const { return (currentItem()==0); } diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp index 51fdc1bd3..4f69f7eaf 100644 --- a/knode/knstringfilter.cpp +++ b/knode/knstringfilter.cpp @@ -94,8 +94,8 @@ void KNStringFilter::save(KSimpleConfig *conf) //=============================================================================== -KNStringFilterWidget::KNStringFilterWidget(const TQString& title, TQWidget *tqparent) - : TQGroupBox(title, tqparent) +KNStringFilterWidget::KNStringFilterWidget(const TQString& title, TQWidget *parent) + : TQGroupBox(title, parent) { fType=new TQComboBox(this); fType->insertItem(i18n("Does Contain")); diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h index 44647641f..2c93a70d4 100644 --- a/knode/knstringfilter.h +++ b/knode/knstringfilter.h @@ -61,7 +61,7 @@ class KNStringFilterWidget : public TQGroupBox { TQ_OBJECT public: - KNStringFilterWidget(const TQString& title, TQWidget *tqparent); + KNStringFilterWidget(const TQString& title, TQWidget *parent); ~KNStringFilterWidget(); KNStringFilter filter(); diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp index 53feed61d..c3f21959a 100644 --- a/knode/knwidgets.cpp +++ b/knode/knwidgets.cpp @@ -84,8 +84,8 @@ int KNListBoxItem::width(const TQListBox *lb) const // **** listbox for dialogs ************************************************** -KNDialogListBox::KNDialogListBox(bool alwaysIgnore, TQWidget * tqparent, const char * name) - : TQListBox(tqparent, name), a_lwaysIgnore(alwaysIgnore) +KNDialogListBox::KNDialogListBox(bool alwaysIgnore, TQWidget * parent, const char * name) + : TQListBox(parent, name), a_lwaysIgnore(alwaysIgnore) { } @@ -107,8 +107,8 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e) //==================================================================================== -KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, const char* name ) - : KDockWidgetHeaderDrag(tqparent, dock, name), f_ocus(false) +KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) + : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false) { connect(tqfocusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*))); } diff --git a/knode/knwidgets.h b/knode/knwidgets.h index ce13cb8dc..002e31373 100644 --- a/knode/knwidgets.h +++ b/knode/knwidgets.h @@ -53,7 +53,7 @@ class KNDialogListBox : public TQListBox { public: // alwaysIgnore==false: enter is ignored when the widget isn't visible/out of focus - KNDialogListBox(bool alwaysIgnore=false, TQWidget * tqparent=0, const char * name=0); + KNDialogListBox(bool alwaysIgnore=false, TQWidget * parent=0, const char * name=0); ~KNDialogListBox(); protected: @@ -72,7 +72,7 @@ class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag TQ_OBJECT public: - KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, + KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name = 0); virtual ~KNDockWidgetHeaderDrag(); diff --git a/knode/utilities.cpp b/knode/utilities.cpp index 0927c9171..2297387bf 100644 --- a/knode/utilities.cpp +++ b/knode/utilities.cpp @@ -134,8 +134,8 @@ bool KNFile::increaseBuffer() TQString KNSaveHelper::lastPath; -KNSaveHelper::KNSaveHelper(TQString saveName, TQWidget *tqparent) - : p_arent(tqparent), s_aveName(saveName), file(0), tmpFile(0) +KNSaveHelper::KNSaveHelper(TQString saveName, TQWidget *parent) + : p_arent(parent), s_aveName(saveName), file(0), tmpFile(0) { } @@ -196,8 +196,8 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle) TQString KNLoadHelper::l_astPath; -KNLoadHelper::KNLoadHelper(TQWidget *tqparent) - : p_arent(tqparent), f_ile(0) +KNLoadHelper::KNLoadHelper(TQWidget *parent) + : p_arent(parent), f_ile(0) { } @@ -261,10 +261,10 @@ KNFile* KNLoadHelper::setURL(KURL url) // **** keyboard selection dialog ********************************************* -int KNHelper::selectDialog(TQWidget *tqparent, const TQString &caption, const TQStringList &options, int initialValue) +int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQStringList &options, int initialValue) { KDialogBase *dlg=new KDialogBase(KDialogBase::Plain, caption, KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, tqparent); + KDialogBase::Ok, parent); TQFrame *page = dlg->plainPage(); TQHBoxLayout *pageL = new TQHBoxLayout(page,8,5); diff --git a/knode/utilities.h b/knode/utilities.h index 936665a93..e88ca6955 100644 --- a/knode/utilities.h +++ b/knode/utilities.h @@ -82,7 +82,7 @@ class KNSaveHelper { public: - KNSaveHelper(TQString saveName, TQWidget *tqparent); + KNSaveHelper(TQString saveName, TQWidget *parent); ~KNSaveHelper(); /** returns a file open for writing */ @@ -107,7 +107,7 @@ class KNLoadHelper { public: - KNLoadHelper(TQWidget *tqparent); + KNLoadHelper(TQWidget *parent); ~KNLoadHelper(); /** opens a file dialog and returns a file open for reading */ @@ -140,7 +140,7 @@ public: /** list selection dialog, used instead of a popup menu when a select action is called via the keyboard. returns -1 when the user canceled the dialog. */ - static int selectDialog(TQWidget *tqparent, const TQString &caption, const TQStringList &options, int initialValue); + static int selectDialog(TQWidget *parent, const TQString &caption, const TQStringList &options, int initialValue); static void saveWindowSize(const TQString &name, const TQSize &s); static void restoreWindowSize(const TQString &name, TQWidget *d, const TQSize &defaultSize); diff --git a/knotes/ChangeLog b/knotes/ChangeLog index fb3918281..6353a107f 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -182,7 +182,7 @@ ChangeLog for KNotes * when there is no note after restoring a session, still show the "No Notes" item in the notes menu * each note now has its own KXMLGUIBilder to get rid of the reparent-call, - the builder's tqparent will be the widgets' tqparent + the builder's parent will be the widgets' parent * fixed #87696: allow default sizes as small as 50x50 pixels 2004/08/20 Michael Brade <brade@kde.org> @@ -347,7 +347,7 @@ ChangeLog for KNotes 2004/03/15 Michael Brade <brade@kde.org> * removed const from KNotesApp::slotPreferences to make it possible to - set KNotesApp as tqparent of the config dialog -> fixes jumping to another + set KNotesApp as parent of the config dialog -> fixes jumping to another desktop when opening the config dialog 2004/03/13 Michael Brade <brade@kde.org> diff --git a/knotes/knote.cpp b/knotes/knote.cpp index f5ebfe3bf..8a260576c 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -79,8 +79,8 @@ using namespace KCal; int KNote::s_ppOffset = 0; -KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ), +KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *name ) + : TQFrame( parent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ), m_label( 0 ), m_pushpin( 0 ), m_fold( 0 ), m_button( 0 ), m_tool( 0 ), m_editor( 0 ), m_config( 0 ), m_journal( j ), m_find( 0 ), m_kwinConf( KSharedConfig::openConfig( "kwinrc", true ) ), @@ -200,17 +200,17 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char m_editor->setCornerWidget( new TQSizeGrip( this ) ); uint width = m_editor->cornerWidget()->width(); uint height = m_editor->cornerWidget()->height(); - TQBitmap tqmask; - tqmask.resize( width, height ); - tqmask.fill( color0 ); + TQBitmap mask; + mask.resize( width, height ); + mask.fill( color0 ); TQPointArray array; array.setPoints( 3, 0, height, width, height, width, 0 ); TQPainter p; - p.begin( &tqmask ); + p.begin( &mask ); p.setBrush( color1 ); p.drawPolygon( array ); p.end(); - m_editor->cornerWidget()->setMask( tqmask ); + m_editor->cornerWidget()->setMask( mask ); m_editor->cornerWidget()->setBackgroundMode( PaletteBase ); // the config file location @@ -319,7 +319,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char // read configuration settings... slotApplyConfig(); - // create the tqmask for the fold---to be done after slotApplyConfig(), + // create the mask for the fold---to be done after slotApplyConfig(), // which calls createFold() m_fold->setMask( TQRegion( m_fold->pixmap()->createHeuristicMask() ) ); @@ -1101,7 +1101,7 @@ void KNote::updateMask() int h = height(); TQRegion reg( 0, s_ppOffset, w, h - s_ppOffset ); - const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->tqmask(); + const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->mask(); TQRegion pushpin_reg( *pushpin_bitmap ); m_pushpin->setMask( pushpin_reg ); pushpin_reg.translate( m_pushpin->x(), m_pushpin->y() ); diff --git a/knotes/knote.h b/knotes/knote.h index 50a007dad..027c88d59 100644 --- a/knotes/knote.h +++ b/knotes/knote.h @@ -53,7 +53,7 @@ class KNote : public TQFrame, virtual public KXMLGUIClient Q_OBJECT TQ_OBJECT public: - KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *tqparent = 0, + KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *parent = 0, const char *name = 0 ); ~KNote(); diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp index 6ce39e4a0..5ca8a453a 100644 --- a/knotes/knotealarmdlg.cpp +++ b/knotes/knotealarmdlg.cpp @@ -45,8 +45,8 @@ #include "knotealarmdlg.h" -KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, caption, Ok|Cancel, Ok ) +KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, caption, Ok|Cancel, Ok ) { TQVBox *page = makeVBoxMainWidget(); TQGroupBox *group = new TQGroupBox( 3, Qt::Vertical, i18n("Scheduled Alarm"), page ); diff --git a/knotes/knotealarmdlg.h b/knotes/knotealarmdlg.h index 7d06d6c0f..888da8a63 100644 --- a/knotes/knotealarmdlg.h +++ b/knotes/knotealarmdlg.h @@ -48,7 +48,7 @@ class KNoteAlarmDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - KNoteAlarmDlg( const TQString& caption, TQWidget *tqparent=0, const char *name=0 ); + KNoteAlarmDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 ); void setIncidence( KCal::Journal *journal ); diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index b1f28f2f2..5dc5009e0 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -30,8 +30,8 @@ #include "knotebutton.h" -KNoteButton::KNoteButton( const TQString& icon, TQWidget *tqparent, const char *name ) - : TQPushButton( tqparent, name ) +KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *name ) + : TQPushButton( parent, name ) { setFocusPolicy( TQ_NoFocus ); tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h index 594727ba5..6a9f7e5bf 100644 --- a/knotes/knotebutton.h +++ b/knotes/knotebutton.h @@ -33,7 +33,7 @@ class KNoteButton: public TQPushButton Q_OBJECT TQ_OBJECT public: - KNoteButton( const TQString& icon, TQWidget *tqparent=0, const char *name=0 ); + KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 ); ~KNoteButton(); virtual TQSize tqsizeHint() const; diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index abb379a03..617d90ab0 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -42,8 +42,8 @@ KNoteConfigDlg::KNoteConfigDlg( KNoteConfig *config, const TQString& title, - TQWidget *tqparent, const char *name ) - : KConfigDialog( tqparent, name, config ? config : KNotesGlobalConfig::self(), IconList, + TQWidget *parent, const char *name ) + : KConfigDialog( parent, name, config ? config : KNotesGlobalConfig::self(), IconList, config ? Default|Ok|Apply|Cancel : Default|Ok|Cancel, Ok ) { setCaption( title ); diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h index 71756082c..a74ed2a0f 100644 --- a/knotes/knoteconfigdlg.h +++ b/knotes/knoteconfigdlg.h @@ -33,7 +33,7 @@ class KNoteConfigDlg : public KConfigDialog TQ_OBJECT public: KNoteConfigDlg( KNoteConfig *config, const TQString &title, - TQWidget *tqparent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); ~KNoteConfigDlg(); public slots: diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index 93a142299..c0647e6de 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -36,8 +36,8 @@ static const short SEP = 5; static const short ICON_SIZE = 10; -KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *tqparent, const char *name ) - : KTextEdit( tqparent, name ), m_note( 0 ) +KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *name ) + : KTextEdit( parent, name ), m_note( 0 ) { setAcceptDrops( true ); setWordWrap( WidgetWidth ); diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h index dfceaef85..da45b0007 100644 --- a/knotes/knoteedit.h +++ b/knotes/knoteedit.h @@ -40,7 +40,7 @@ class KNoteEdit : public KTextEdit Q_OBJECT TQ_OBJECT public: - KNoteEdit( KActionCollection *actions, TQWidget *tqparent=0, const char *name=0 ); + KNoteEdit( KActionCollection *actions, TQWidget *parent=0, const char *name=0 ); ~KNoteEdit(); void setNote( KNote *_note ) { m_note = _note; diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp index f00be4c5f..3b8b8f50f 100644 --- a/knotes/knotehostdlg.cpp +++ b/knotes/knotehostdlg.cpp @@ -46,8 +46,8 @@ #include "knotesglobalconfig.h" -KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, caption, Ok|Cancel, Ok, true ) +KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, caption, Ok|Cancel, Ok, true ) { TQVBox *page = makeVBoxMainWidget(); (void)new TQLabel( i18n("Hostname or IP address:"), page ); diff --git a/knotes/knotehostdlg.h b/knotes/knotehostdlg.h index 91959dc9c..279e67f6e 100644 --- a/knotes/knotehostdlg.h +++ b/knotes/knotehostdlg.h @@ -46,7 +46,7 @@ class KNoteHostDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - KNoteHostDlg( const TQString& caption, TQWidget *tqparent=0, const char *name=0 ); + KNoteHostDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 ); ~KNoteHostDlg(); TQString host() const; diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp index b248bdebc..5d8b0de28 100644 --- a/knotes/knotesalarm.cpp +++ b/knotes/knotesalarm.cpp @@ -42,8 +42,8 @@ #include "knotesglobalconfig.h" -KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), +KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *parent, const char *name ) + : TQObject( parent, name ), m_manager( manager ), m_checkTimer( 0, "m_checkTimer" ) { @@ -67,7 +67,7 @@ void KNotesAlarm::checkAlarms() TQValueList<KCal::Alarm *>::ConstIterator it; for ( it = alarms.constBegin(); it != alarms.constEnd(); ++it ) { - KCal::Incidence *incidence = (*it)->tqparent(); + KCal::Incidence *incidence = (*it)->parent(); notes += incidence->summary(); } diff --git a/knotes/knotesalarm.h b/knotes/knotesalarm.h index ea0225954..dc8ff2782 100644 --- a/knotes/knotesalarm.h +++ b/knotes/knotesalarm.h @@ -47,7 +47,7 @@ class KNotesAlarm : public TQObject Q_OBJECT TQ_OBJECT public: - KNotesAlarm( KNotesResourceManager *manager, TQObject *tqparent = 0, const char *name = 0 ); + KNotesAlarm( KNotesResourceManager *manager, TQObject *parent = 0, const char *name = 0 ); private slots: void checkAlarms(); diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 7b38121c3..3ea8caea6 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -60,8 +60,8 @@ using namespace KNetwork; class KNotesKeyDialog : public KDialogBase { public: - KNotesKeyDialog( KGlobalAccel *globals, TQWidget *tqparent, const char* name = 0 ) - : KDialogBase( tqparent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok ) + KNotesKeyDialog( KGlobalAccel *globals, TQWidget *parent, const char* name = 0 ) + : KDialogBase( parent, name, true, i18n("Configure Shortcuts"), Default|Ok|Cancel, Ok ) { m_keyChooser = new KKeyChooser( globals, this ); setMainWidget( m_keyChooser ); diff --git a/knotes/resourcelocal_plugin.cpp b/knotes/resourcelocal_plugin.cpp index dcb3fa9a3..846a5a3a6 100644 --- a/knotes/resourcelocal_plugin.cpp +++ b/knotes/resourcelocal_plugin.cpp @@ -43,9 +43,9 @@ public: return new ResourceLocal( config ); } - KRES::ConfigWidget *configWidget( TQWidget *tqparent ) + KRES::ConfigWidget *configWidget( TQWidget *parent ) { - return new ResourceLocalConfig(tqparent); + return new ResourceLocalConfig(parent); } }; @@ -56,9 +56,9 @@ extern "C" return new LocalNotesFactory(); } - KRES::ConfigWidget *config_widget( TQWidget* tqparent ) + KRES::ConfigWidget *config_widget( TQWidget* parent ) { - return new ResourceLocalConfig( tqparent, "Configure Local Resource" ); + return new ResourceLocalConfig( parent, "Configure Local Resource" ); } KRES::Resource *resource( const KConfig* config ) diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp index c24e672a5..207730a14 100644 --- a/knotes/resourcelocalconfig.cpp +++ b/knotes/resourcelocalconfig.cpp @@ -29,8 +29,8 @@ #include "resourcelocal.h" #include "resourcelocalconfig.h" -ResourceLocalConfig::ResourceLocalConfig( TQWidget *tqparent, const char *name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceLocalConfig::ResourceLocalConfig( TQWidget *parent, const char *name ) + : KRES::ConfigWidget( parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); diff --git a/knotes/resourcelocalconfig.h b/knotes/resourcelocalconfig.h index dfc1b6773..ee4a987b9 100644 --- a/knotes/resourcelocalconfig.h +++ b/knotes/resourcelocalconfig.h @@ -30,7 +30,7 @@ class ResourceLocalConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - ResourceLocalConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceLocalConfig( TQWidget *parent = 0, const char *name = 0 ); virtual ~ResourceLocalConfig(); public slots: diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index f8d258013..a858f5d46 100644 --- a/kode/kwsdl/converter.cpp +++ b/kode/kwsdl/converter.cpp @@ -218,13 +218,13 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type ) KODE::Function marshal( "marshal", "void" ); marshal.setStatic( true ); marshal.addArgument( "TQDomDocument &doc" ); - marshal.addArgument( "TQDomElement &tqparent" ); + marshal.addArgument( "TQDomElement &parent" ); marshal.addArgument( "const TQString &name" ); marshal.addArgument( "const " + typeName + "* value" ); KODE::Function demarshal( "demarshal", "void" ); demarshal.setStatic( true ); - demarshal.addArgument( "const TQDomElement &tqparent" ); + demarshal.addArgument( "const TQDomElement &parent" ); demarshal.addArgument( typeName + "* value" ); KODE::Code marshalCode, demarshalCode, code; @@ -275,7 +275,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type ) // marshal marshalCode += "TQDomElement root = doc.createElement( name );"; marshalCode += "root.setAttribute( \"xsi:type\", \"ns1:" + type->name() + "\" );"; - marshalCode += "tqparent.appendChild( root );"; + marshalCode += "parent.appendChild( root );"; marshalCode += "root.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );"; // demarshal value @@ -294,23 +294,23 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type ) demarshalValue.setBody( code ); // demarshal - demarshalCode += "Serializer::demarshalValue( tqparent.text(), value );"; + demarshalCode += "Serializer::demarshalValue( parent.text(), value );"; mSerializer.addFunction( marshalValue ); mSerializer.addFunction( demarshalValue ); } else if ( type->baseType() != Schema::XSDType::INVALID ) { marshalCode += "if ( value->value() ) {"; marshalCode.indent(); - marshalCode += "Serializer::marshal( doc, tqparent, name, value->value() );"; + marshalCode += "Serializer::marshal( doc, parent, name, value->value() );"; marshalCode.unindent(); marshalCode += "}"; - demarshalCode += "const TQString text = tqparent.text();"; + demarshalCode += "const TQString text = parent.text();"; demarshalCode.newLine(); demarshalCode += "if ( !text.isEmpty() ) {"; demarshalCode.indent(); demarshalCode += baseType + "* data = new " + baseType + ";"; - demarshalCode += "Serializer::demarshal( tqparent, value );"; + demarshalCode += "Serializer::demarshal( parent, value );"; demarshalCode += "value->setValue( data );"; demarshalCode.unindent(); demarshalCode += "}"; @@ -352,12 +352,12 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type ) marshalCode += "}"; marshalCode.newLine(); marshalCode += "TQDomElement element = doc.createElement( name );"; - marshalCode += "tqparent.appendChild( element );"; + marshalCode += "parent.appendChild( element );"; marshalCode += "element.appendChild( doc.createTextNode( list.join( \" \" ) ) );"; marshalCode.unindent(); marshalCode += "}"; - demarshalCode += "const TQStringList list = TQStringList::split( \" \", tqparent.text(), false );"; + demarshalCode += "const TQStringList list = TQStringList::split( \" \", parent.text(), false );"; demarshalCode += "if ( !list.isEmpty() ) {"; demarshalCode.indent(); demarshalCode += "TQPtrList<" + listType + ">* entries = new TQPtrList<" + listType + ">;"; @@ -511,13 +511,13 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type ) KODE::Function marshal( "marshal", "void" ); marshal.setStatic( true ); marshal.addArgument( "TQDomDocument &doc" ); - marshal.addArgument( "TQDomElement &tqparent" ); + marshal.addArgument( "TQDomElement &parent" ); marshal.addArgument( "const TQString &name" ); marshal.addArgument( "const " + typeName + "* value" ); KODE::Function demarshal( "demarshal", "void" ); demarshal.setStatic( true ); - demarshal.addArgument( "const TQDomElement &tqparent" ); + demarshal.addArgument( "const TQDomElement &parent" ); demarshal.addArgument( typeName + "* value" ); KODE::Code marshalCode, demarshalCode, demarshalFinalCode; @@ -535,9 +535,9 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type ) marshalCode += "TQDomElement root = doc.createElement( name );"; marshalCode += "root.setAttribute( \"xsi:type\", \"ns1:" + typeName + "\" );"; - marshalCode += "tqparent.appendChild( root );"; + marshalCode += "parent.appendChild( root );"; - demarshalCode += "TQDomNode node = tqparent.firstChild();"; + demarshalCode += "TQDomNode node = parent.firstChild();"; demarshalCode += "while ( !node.isNull() ) {"; demarshalCode.indent(); demarshalCode += "TQDomElement element = node.toElement();"; @@ -568,7 +568,7 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type ) marshalCode += "element.setAttribute( \"xmlns:ns1\", \"http://schemas.xmlsoap.org/soap/encoding/\" );"; marshalCode += "element.setAttribute( \"xsi:type\", \"ns1:Array\" );"; marshalCode += "element.setAttribute( \"ns1:arrayType\", \"ns1:" + typeName + "[\" + TQString::number( list->count() ) + \"]\" );"; - marshalCode += "tqparent.appendChild( element );"; + marshalCode += "parent.appendChild( element );"; marshalCode.newLine(); marshalCode += "TQPtrListIterator<" + typeName + "> it( *list );"; marshalCode += "while ( it.current() != 0 ) {"; @@ -629,7 +629,7 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type ) marshalCode += "if ( value->" + mNameMapper.escape( lowerName ) + "() )"; marshalCode.indent(); - marshalCode += "tqparent.setAttribute( \"" + (*attrIt).name() + "\"," + marshalCode += "parent.setAttribute( \"" + (*attrIt).name() + "\"," "Serializer::marshalValue( value->" + mNameMapper.escape( lowerName ) + "() ) );"; marshalCode.newLine(); @@ -879,7 +879,7 @@ void Converter::createUtilClasses() marshal = KODE::Function( "marshal", "void" ); marshal.setStatic( true ); marshal.addArgument( "TQDomDocument &doc" ); - marshal.addArgument( "TQDomElement &tqparent" ); + marshal.addArgument( "TQDomElement &parent" ); marshal.addArgument( "const TQString &name" ); marshal.addArgument( "const " + entry.type + "* value" ); @@ -887,7 +887,7 @@ void Converter::createUtilClasses() code += "TQDomElement element = doc.createElement( name );"; code += "element.setAttribute( \"xsi:type\", \"" + entry.xsdType + "\" );"; code += "element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );"; - code += "tqparent.appendChild( element );"; + code += "parent.appendChild( element );"; marshal.setBody( code ); mSerializer.addFunction( marshal ); diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index ef7988125..8d897c4c5 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -55,14 +55,14 @@ void BinaryInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void BinaryInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void BinaryInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void BinaryInputField::setData( const TQString &data ) @@ -76,9 +76,9 @@ TQString BinaryInputField::data() const return TQString::fromUtf8( data.data(), data.size() ); } -TQWidget *BinaryInputField::createWidget( TQWidget *tqparent ) +TQWidget *BinaryInputField::createWidget( TQWidget *parent ) { - mInputWidget = new BinaryWidget( tqparent ); + mInputWidget = new BinaryWidget( parent ); if ( !mValue.isEmpty() ) mInputWidget->setData( mValue ); @@ -94,8 +94,8 @@ void BinaryInputField::valueChanged( const TQByteArray &value ) } -BinaryWidget::BinaryWidget( TQWidget *tqparent ) - : TQWidget( tqparent, "BinaryWidget" ), +BinaryWidget::BinaryWidget( TQWidget *parent ) + : TQWidget( parent, "BinaryWidget" ), mMainWidget( 0 ) { mLayout = new TQGridLayout( this, 3, 2, 11, 6 ); diff --git a/kode/kwsdl/kung/binaryinputfield.h b/kode/kwsdl/kung/binaryinputfield.h index ad586f5d9..636b6a248 100644 --- a/kode/kwsdl/kung/binaryinputfield.h +++ b/kode/kwsdl/kung/binaryinputfield.h @@ -39,12 +39,12 @@ class BinaryInputField : public SimpleInputField BinaryInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void valueChanged( const TQByteArray &value ); @@ -62,7 +62,7 @@ class BinaryWidget : public TQWidget TQ_OBJECT public: - BinaryWidget( TQWidget *tqparent ); + BinaryWidget( TQWidget *parent ); void setData( const TQByteArray &data ); diff --git a/kode/kwsdl/kung/boolinputfield.cpp b/kode/kwsdl/kung/boolinputfield.cpp index c05df02b1..e3eb3eef1 100644 --- a/kode/kwsdl/kung/boolinputfield.cpp +++ b/kode/kwsdl/kung/boolinputfield.cpp @@ -39,14 +39,14 @@ void BoolInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void BoolInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void BoolInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:boolean" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void BoolInputField::setData( const TQString &data ) @@ -59,9 +59,9 @@ TQString BoolInputField::data() const return ( mValue ? "true" : "false" ); } -TQWidget *BoolInputField::createWidget( TQWidget *tqparent ) +TQWidget *BoolInputField::createWidget( TQWidget *parent ) { - mInputWidget = new TQCheckBox( tqparent ); + mInputWidget = new TQCheckBox( parent ); mInputWidget->setChecked( mValue ); diff --git a/kode/kwsdl/kung/boolinputfield.h b/kode/kwsdl/kung/boolinputfield.h index c48ca96be..c2cda0c85 100644 --- a/kode/kwsdl/kung/boolinputfield.h +++ b/kode/kwsdl/kung/boolinputfield.h @@ -37,12 +37,12 @@ class BoolInputField : public SimpleInputField BoolInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( bool ); diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp index 30662690b..bfcd375e2 100644 --- a/kode/kwsdl/kung/complexbaseinputfield.cpp +++ b/kode/kwsdl/kung/complexbaseinputfield.cpp @@ -99,7 +99,7 @@ void ComplexBaseInputField::setXMLData( const TQDomElement &element ) } } -void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); @@ -125,7 +125,7 @@ void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqpa } } - tqparent.appendChild( element ); + parent.appendChild( element ); } void ComplexBaseInputField::setData( const TQString& ) @@ -137,9 +137,9 @@ TQString ComplexBaseInputField::data() const return TQString(); } -TQWidget *ComplexBaseInputField::createWidget( TQWidget *tqparent ) +TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent ) { - TQGroupBox *inputWidget = new TQGroupBox( mName, tqparent ); + TQGroupBox *inputWidget = new TQGroupBox( mName, parent ); inputWidget->setColumnLayout( 0, TQt::Horizontal ); TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 ); diff --git a/kode/kwsdl/kung/complexbaseinputfield.h b/kode/kwsdl/kung/complexbaseinputfield.h index f47c6d044..9fc47dbc7 100644 --- a/kode/kwsdl/kung/complexbaseinputfield.h +++ b/kode/kwsdl/kung/complexbaseinputfield.h @@ -30,12 +30,12 @@ class ComplexBaseInputField : public ComplexInputField ComplexBaseInputField( const TQString &name, const Schema::ComplexType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); }; #endif diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp index ffb9af7a1..d49c19472 100644 --- a/kode/kwsdl/kung/dateinputfield.cpp +++ b/kode/kwsdl/kung/dateinputfield.cpp @@ -39,14 +39,14 @@ void DateInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void DateInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void DateInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:date" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void DateInputField::setData( const TQString &data ) @@ -59,9 +59,9 @@ TQString DateInputField::data() const return mValue.toString( TQt::ISODate ); } -TQWidget *DateInputField::createWidget( TQWidget *tqparent ) +TQWidget *DateInputField::createWidget( TQWidget *parent ) { - mInputWidget = new KDatePicker( tqparent ); + mInputWidget = new KDatePicker( parent ); mInputWidget->setDate( mValue ); diff --git a/kode/kwsdl/kung/dateinputfield.h b/kode/kwsdl/kung/dateinputfield.h index 8dcd0f89f..082bb5626 100644 --- a/kode/kwsdl/kung/dateinputfield.h +++ b/kode/kwsdl/kung/dateinputfield.h @@ -38,12 +38,12 @@ class DateInputField : public SimpleInputField DateInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( TQDate ); diff --git a/kode/kwsdl/kung/doubleinputfield.cpp b/kode/kwsdl/kung/doubleinputfield.cpp index d1ffdd277..78f73bcd6 100644 --- a/kode/kwsdl/kung/doubleinputfield.cpp +++ b/kode/kwsdl/kung/doubleinputfield.cpp @@ -41,14 +41,14 @@ void DoubleInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void DoubleInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void DoubleInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void DoubleInputField::setData( const TQString &data ) @@ -61,9 +61,9 @@ TQString DoubleInputField::data() const return TQString::number( mValue ); } -TQWidget *DoubleInputField::createWidget( TQWidget *tqparent ) +TQWidget *DoubleInputField::createWidget( TQWidget *parent ) { - mInputWidget = new KDoubleSpinBox( tqparent ); + mInputWidget = new KDoubleSpinBox( parent ); if ( mType ) { if ( mType->facetType() & Schema::SimpleType::MININC ) diff --git a/kode/kwsdl/kung/doubleinputfield.h b/kode/kwsdl/kung/doubleinputfield.h index 78f72cd6c..93f3a012c 100644 --- a/kode/kwsdl/kung/doubleinputfield.h +++ b/kode/kwsdl/kung/doubleinputfield.h @@ -37,12 +37,12 @@ class DoubleInputField : public SimpleInputField DoubleInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( double ); diff --git a/kode/kwsdl/kung/enuminputfield.cpp b/kode/kwsdl/kung/enuminputfield.cpp index 5d3fcf087..f290803b6 100644 --- a/kode/kwsdl/kung/enuminputfield.cpp +++ b/kode/kwsdl/kung/enuminputfield.cpp @@ -43,14 +43,14 @@ void EnumInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void EnumInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void EnumInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:string" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void EnumInputField::setData( const TQString &data ) @@ -63,9 +63,9 @@ TQString EnumInputField::data() const return mValue; } -TQWidget *EnumInputField::createWidget( TQWidget *tqparent ) +TQWidget *EnumInputField::createWidget( TQWidget *parent ) { - mInputWidget = new KComboBox( tqparent ); + mInputWidget = new KComboBox( parent ); mInputWidget->insertStringList( mEnums ); mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) ); diff --git a/kode/kwsdl/kung/enuminputfield.h b/kode/kwsdl/kung/enuminputfield.h index 91d2b19fb..36bb101fe 100644 --- a/kode/kwsdl/kung/enuminputfield.h +++ b/kode/kwsdl/kung/enuminputfield.h @@ -37,12 +37,12 @@ class EnumInputField : public SimpleInputField EnumInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( int ); diff --git a/kode/kwsdl/kung/inputdialog.cpp b/kode/kwsdl/kung/inputdialog.cpp index dc1a711c8..17aa601b0 100644 --- a/kode/kwsdl/kung/inputdialog.cpp +++ b/kode/kwsdl/kung/inputdialog.cpp @@ -23,8 +23,8 @@ #include "inputdialog.h" -InputDialog::InputDialog( TQWidget *page, TQWidget *tqparent ) - : KDialogBase( Swallow, "", Ok | Cancel, Ok, tqparent, "", true, true ) +InputDialog::InputDialog( TQWidget *page, TQWidget *parent ) + : KDialogBase( Swallow, "", Ok | Cancel, Ok, parent, "", true, true ) { setMainWidget( page ); diff --git a/kode/kwsdl/kung/inputdialog.h b/kode/kwsdl/kung/inputdialog.h index fbefe4d1a..b592545b7 100644 --- a/kode/kwsdl/kung/inputdialog.h +++ b/kode/kwsdl/kung/inputdialog.h @@ -27,7 +27,7 @@ class InputDialog : public KDialogBase { public: - InputDialog( TQWidget *page, TQWidget *tqparent ); + InputDialog( TQWidget *page, TQWidget *parent ); }; #endif diff --git a/kode/kwsdl/kung/inputfield.h b/kode/kwsdl/kung/inputfield.h index 100cc4bb4..4b05044bd 100644 --- a/kode/kwsdl/kung/inputfield.h +++ b/kode/kwsdl/kung/inputfield.h @@ -68,7 +68,7 @@ class InputField : public TQObject /** Returns the xml value of this field. */ - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ) = 0; + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ) = 0; /** Sets the plain data of this field as string. @@ -84,7 +84,7 @@ class InputField : public TQObject Returns a pointer to a new created input widget which can be used to to modify the value. */ - virtual TQWidget *createWidget( TQWidget *tqparent ) = 0; + virtual TQWidget *createWidget( TQWidget *parent ) = 0; /** Add a child field. diff --git a/kode/kwsdl/kung/integerinputfield.cpp b/kode/kwsdl/kung/integerinputfield.cpp index 9db5c40a8..022ec0d84 100644 --- a/kode/kwsdl/kung/integerinputfield.cpp +++ b/kode/kwsdl/kung/integerinputfield.cpp @@ -43,14 +43,14 @@ void IntegerInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void IntegerInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void IntegerInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void IntegerInputField::setData( const TQString &data ) @@ -63,9 +63,9 @@ TQString IntegerInputField::data() const return TQString::number( mValue ); } -TQWidget *IntegerInputField::createWidget( TQWidget *tqparent ) +TQWidget *IntegerInputField::createWidget( TQWidget *parent ) { - mInputWidget = new KIntSpinBox( tqparent ); + mInputWidget = new KIntSpinBox( parent ); // basic restrictions if ( mTypeName == "byte" ) { diff --git a/kode/kwsdl/kung/integerinputfield.h b/kode/kwsdl/kung/integerinputfield.h index bf6e61ed6..2ffeb1ec5 100644 --- a/kode/kwsdl/kung/integerinputfield.h +++ b/kode/kwsdl/kung/integerinputfield.h @@ -37,12 +37,12 @@ class IntegerInputField : public SimpleInputField IntegerInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( int ); diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 409eaf102..7a5eeb713 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -62,11 +62,11 @@ void ListInputField::setXMLData( const TQDomElement &element ) } } -void ListInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void ListInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { InputField::List::Iterator it; for ( it = mFields.begin(); it != mFields.end(); ++it ) { - (*it)->xmlData( document, tqparent ); + (*it)->xmlData( document, parent ); } } @@ -79,16 +79,16 @@ TQString ListInputField::data() const return TQString(); } -TQWidget *ListInputField::createWidget( TQWidget *tqparent ) +TQWidget *ListInputField::createWidget( TQWidget *parent ) { - mInputWidget = new ListWidget( this, name(), mTypeName, tqparent ); + mInputWidget = new ListWidget( this, name(), mTypeName, parent ); return mInputWidget; } -ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *tqparent ) - : TQWidget( tqparent ), +ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent ) + : TQWidget( parent ), 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 82940370f..1d48cc6a9 100644 --- a/kode/kwsdl/kung/listinputfield.h +++ b/kode/kwsdl/kung/listinputfield.h @@ -39,12 +39,12 @@ class ListInputField : public SimpleInputField ListInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private: ListWidget *mInputWidget; @@ -57,7 +57,7 @@ class ListWidget : public TQWidget TQ_OBJECT public: - ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *tqparent ); + ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent ); void update(); diff --git a/kode/kwsdl/kung/outputdialog.cpp b/kode/kwsdl/kung/outputdialog.cpp index bef2cd2fb..6cdb7e579 100644 --- a/kode/kwsdl/kung/outputdialog.cpp +++ b/kode/kwsdl/kung/outputdialog.cpp @@ -23,8 +23,8 @@ #include "outputdialog.h" -OutputDialog::OutputDialog( TQWidget *page, TQWidget *tqparent ) - : KDialogBase( Swallow, "", Ok, Ok, tqparent, "", true, true ) +OutputDialog::OutputDialog( TQWidget *page, TQWidget *parent ) + : KDialogBase( Swallow, "", Ok, Ok, parent, "", true, true ) { setMainWidget( page ); } diff --git a/kode/kwsdl/kung/outputdialog.h b/kode/kwsdl/kung/outputdialog.h index bab043201..a3c558789 100644 --- a/kode/kwsdl/kung/outputdialog.h +++ b/kode/kwsdl/kung/outputdialog.h @@ -27,7 +27,7 @@ class OutputDialog : public KDialogBase { public: - OutputDialog( TQWidget *page, TQWidget *tqparent ); + OutputDialog( TQWidget *page, TQWidget *parent ); }; #endif diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp index d7e5639b6..6ca3409d7 100644 --- a/kode/kwsdl/kung/pageinputfield.cpp +++ b/kode/kwsdl/kung/pageinputfield.cpp @@ -65,7 +65,7 @@ void PageInputField::setXMLData( const TQDomElement &element ) } } -void PageInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void PageInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( "ns1:" + mName ); @@ -73,7 +73,7 @@ void PageInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) for ( it = mFields.begin(); it != mFields.end(); ++it ) (*it)->xmlData( document, element ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void PageInputField::setData( const TQString& ) @@ -85,9 +85,9 @@ TQString PageInputField::data() const return TQString(); } -TQWidget *PageInputField::createWidget( TQWidget *tqparent ) +TQWidget *PageInputField::createWidget( TQWidget *parent ) { - TQWidget *mInputWidget = new TQWidget( tqparent, "PageInputWidget" ); + TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" ); TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); InputField::List::Iterator it; diff --git a/kode/kwsdl/kung/pageinputfield.h b/kode/kwsdl/kung/pageinputfield.h index 05321c31e..22d5fdc0e 100644 --- a/kode/kwsdl/kung/pageinputfield.h +++ b/kode/kwsdl/kung/pageinputfield.h @@ -37,12 +37,12 @@ class PageInputField : public InputField PageInputField( const TQString &name, const KWSDL::Message &message ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private: TQWidget *mInputWidget; diff --git a/kode/kwsdl/kung/simplebaseinputfield.cpp b/kode/kwsdl/kung/simplebaseinputfield.cpp index bd2aa90ea..0198723cf 100644 --- a/kode/kwsdl/kung/simplebaseinputfield.cpp +++ b/kode/kwsdl/kung/simplebaseinputfield.cpp @@ -59,14 +59,14 @@ void SimpleBaseInputField::setXMLData( const TQDomElement &element ) } } -void SimpleBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void SimpleBaseInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { if ( mType->subType() == Schema::SimpleType::TypeRestriction ) { InputField *field = mFields.first(); if ( !field ) { qDebug( "SimpleBaseInputField: No child found" ); } else { - field->xmlData( document, tqparent ); + field->xmlData( document, parent ); } } else { qDebug( "SimpleBaseInputField: Unsupported subtype" ); @@ -103,7 +103,7 @@ TQString SimpleBaseInputField::data() const return TQString(); } -TQWidget *SimpleBaseInputField::createWidget( TQWidget *tqparent ) +TQWidget *SimpleBaseInputField::createWidget( TQWidget *parent ) { if ( mType->subType() == Schema::SimpleType::TypeRestriction ) { InputField *field = mFields.first(); @@ -111,7 +111,7 @@ TQWidget *SimpleBaseInputField::createWidget( TQWidget *tqparent ) qDebug( "SimpleBaseInputField: No child found" ); return 0; } else { - return field->createWidget( tqparent ); + return field->createWidget( parent ); } } else { qDebug( "SimpleBaseInputField: Unsupported subtype" ); diff --git a/kode/kwsdl/kung/simplebaseinputfield.h b/kode/kwsdl/kung/simplebaseinputfield.h index aa52bc080..dab7e906c 100644 --- a/kode/kwsdl/kung/simplebaseinputfield.h +++ b/kode/kwsdl/kung/simplebaseinputfield.h @@ -30,12 +30,12 @@ class SimpleBaseInputField : public SimpleInputField SimpleBaseInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); }; #endif diff --git a/kode/kwsdl/kung/stringinputfield.cpp b/kode/kwsdl/kung/stringinputfield.cpp index 6f1bc4f70..390c5bc1b 100644 --- a/kode/kwsdl/kung/stringinputfield.cpp +++ b/kode/kwsdl/kung/stringinputfield.cpp @@ -42,14 +42,14 @@ void StringInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void StringInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void StringInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void StringInputField::setData( const TQString &data ) @@ -62,9 +62,9 @@ TQString StringInputField::data() const return mValue; } -TQWidget *StringInputField::createWidget( TQWidget *tqparent ) +TQWidget *StringInputField::createWidget( TQWidget *parent ) { - mInputWidget = new TQLineEdit( tqparent ); + mInputWidget = new TQLineEdit( parent ); if ( mType ) { if ( mType->facetType() & Schema::SimpleType::LENGTH ) // TODO: using TQValidator here? diff --git a/kode/kwsdl/kung/stringinputfield.h b/kode/kwsdl/kung/stringinputfield.h index cd53a9b18..7bfc41242 100644 --- a/kode/kwsdl/kung/stringinputfield.h +++ b/kode/kwsdl/kung/stringinputfield.h @@ -37,12 +37,12 @@ class StringInputField : public SimpleInputField StringInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( const TQString& ); diff --git a/kode/kwsdl/kung/timeinputfield.cpp b/kode/kwsdl/kung/timeinputfield.cpp index 29b89fcab..dce73bdd4 100644 --- a/kode/kwsdl/kung/timeinputfield.cpp +++ b/kode/kwsdl/kung/timeinputfield.cpp @@ -39,14 +39,14 @@ void TimeInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void TimeInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void TimeInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:time" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void TimeInputField::setData( const TQString &data ) @@ -59,9 +59,9 @@ TQString TimeInputField::data() const return mValue.toString( TQt::ISODate ); } -TQWidget *TimeInputField::createWidget( TQWidget *tqparent ) +TQWidget *TimeInputField::createWidget( TQWidget *parent ) { - mInputWidget = new KTimeWidget( tqparent ); + mInputWidget = new KTimeWidget( parent ); mInputWidget->setTime( mValue ); diff --git a/kode/kwsdl/kung/timeinputfield.h b/kode/kwsdl/kung/timeinputfield.h index f3b14c9d8..30d219ae0 100644 --- a/kode/kwsdl/kung/timeinputfield.h +++ b/kode/kwsdl/kung/timeinputfield.h @@ -38,12 +38,12 @@ class TimeInputField : public SimpleInputField TimeInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( const TQTime& ); diff --git a/kode/kwsdl/parser.cpp b/kode/kwsdl/parser.cpp index 6e2a37dc0..49f77eca4 100644 --- a/kode/kwsdl/parser.cpp +++ b/kode/kwsdl/parser.cpp @@ -94,9 +94,9 @@ void Parser::parse( const TQDomElement &root ) } } -void Parser::parseTypes( const TQDomElement &tqparent ) +void Parser::parseTypes( const TQDomElement &parent ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -108,9 +108,9 @@ void Parser::parseTypes( const TQDomElement &tqparent ) } } -void Parser::parseMessage( const TQDomElement &tqparent, Message &message ) +void Parser::parseMessage( const TQDomElement &parent, Message &message ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -130,9 +130,9 @@ void Parser::parseMessage( const TQDomElement &tqparent, Message &message ) } } -void Parser::parsePortType( const TQDomElement &tqparent, Port &port ) +void Parser::parsePortType( const TQDomElement &parent, Port &port ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -161,11 +161,11 @@ void Parser::parsePortType( const TQDomElement &tqparent, Port &port ) } } -void Parser::parseBinding( const TQDomElement &tqparent ) +void Parser::parseBinding( const TQDomElement &parent ) { - Binding binding( sns( tqparent.attribute( "name" ) ), sns( tqparent.attribute( "type" ) ) ); + Binding binding( sns( parent.attribute( "name" ) ), sns( parent.attribute( "type" ) ) ); - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -216,9 +216,9 @@ void Parser::parseBinding( const TQDomElement &tqparent ) mBindings.append( binding ); } -void Parser::parseService( const TQDomElement &tqparent ) +void Parser::parseService( const TQDomElement &parent ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { diff --git a/kode/kwsdl/schema/parser.cpp b/kode/kwsdl/schema/parser.cpp index 148599751..7ec3804f8 100644 --- a/kode/kwsdl/schema/parser.cpp +++ b/kode/kwsdl/schema/parser.cpp @@ -446,7 +446,7 @@ void Parser::addElement( const TQDomElement &element, ComplexType *cType ) && ct->elementName( 0 ) == "any" ) { // if the complex type is <any> then we dont need a type for it. - // make the tqparent's type as XSDType::ANY + // make the parent's type as XSDType::ANY delete ct; type_id = XSDType::ANY; } else { diff --git a/kode/kwsdl/tests/google/serializer.cpp b/kode/kwsdl/tests/google/serializer.cpp index 281f3269a..5416b7073 100644 --- a/kode/kwsdl/tests/google/serializer.cpp +++ b/kode/kwsdl/tests/google/serializer.cpp @@ -41,12 +41,12 @@ void Serializer::demarshalValue( const TQString &str, TQString *value ) *value = str; } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQString* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQString* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:string" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, TQString* value ) @@ -64,12 +64,12 @@ void Serializer::demarshalValue( const TQString &str, bool *value ) *value = (str.lower() == "true" ? true : false); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const bool* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const bool* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:boolean" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, bool* value ) @@ -87,12 +87,12 @@ void Serializer::demarshalValue( const TQString &str, float *value ) *value = str.toFloat(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const float* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const float* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:TODO" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, float* value ) @@ -110,12 +110,12 @@ void Serializer::demarshalValue( const TQString &str, int *value ) *value = str.toInt(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const int* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const int* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:int" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, int* value ) @@ -133,12 +133,12 @@ void Serializer::demarshalValue( const TQString &str, unsigned int *value ) *value = str.toUInt(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned int* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned int* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:unsignedByte" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, unsigned int* value ) @@ -156,12 +156,12 @@ void Serializer::demarshalValue( const TQString &str, double *value ) *value = str.toDouble(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const double* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const double* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:double" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, double* value ) @@ -179,12 +179,12 @@ void Serializer::demarshalValue( const TQString &str, char *value ) *value = str[ 0 ].latin1(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const char* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const char* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:byte" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, char* value ) @@ -202,12 +202,12 @@ void Serializer::demarshalValue( const TQString &str, unsigned char *value ) *value = str[ 0 ].latin1(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned char* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned char* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:unsignedByte" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, unsigned char* value ) @@ -225,12 +225,12 @@ void Serializer::demarshalValue( const TQString &str, short *value ) *value = str.toShort(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const short* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const short* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:short" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, short* value ) @@ -248,12 +248,12 @@ void Serializer::demarshalValue( const TQString &str, TQByteArray *value ) *value = KCodecs::base64Decode( str.utf8() ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQByteArray* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQByteArray* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:base64Binary" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, TQByteArray* value ) @@ -271,12 +271,12 @@ void Serializer::demarshalValue( const TQString &str, TQDateTime *value ) *value = TQDateTime::fromString( str, TQt::ISODate ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDateTime* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDateTime* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:dateTime" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, TQDateTime* value ) @@ -294,12 +294,12 @@ void Serializer::demarshalValue( const TQString &str, TQDate *value ) *value = TQDate::fromString( str, TQt::ISODate ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDate* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDate* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:date" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, TQDate* value ) @@ -307,11 +307,11 @@ void Serializer::demarshal( const TQDomElement &element, TQDate* value ) Serializer::demarshalValue( element.text(), value ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElementArray* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElementArray* value ) { TQDomElement root = doc.createElement( name ); root.setAttribute( "xsi:type", "ns1:ResultElementArray" ); - tqparent.appendChild( root ); + parent.appendChild( root ); if ( value->items() ) { const TQPtrList<ResultElement>* list = value->items(); @@ -319,7 +319,7 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt element.setAttribute( "xmlns:ns1", "http://schemas.xmlsoap.org/soap/encoding/" ); element.setAttribute( "xsi:type", "ns1:Array" ); element.setAttribute( "ns1:arrayType", "ns1:ResultElement[" + TQString::number( list->count() ) + "]" ); - tqparent.appendChild( element ); + parent.appendChild( element ); TQPtrListIterator<ResultElement> it( *list ); while ( it.current() != 0 ) { @@ -329,11 +329,11 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt } } -void Serializer::demarshal( const TQDomElement &tqparent, ResultElementArray* value ) +void Serializer::demarshal( const TQDomElement &parent, ResultElementArray* value ) { TQPtrList<ResultElement>* itemsList = new TQPtrList<ResultElement>(); itemsList->setAutoDelete( true ); - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -349,11 +349,11 @@ void Serializer::demarshal( const TQDomElement &tqparent, ResultElementArray* va value->setItems( itemsList ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategoryArray* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategoryArray* value ) { TQDomElement root = doc.createElement( name ); root.setAttribute( "xsi:type", "ns1:DirectoryCategoryArray" ); - tqparent.appendChild( root ); + parent.appendChild( root ); if ( value->items() ) { const TQPtrList<DirectoryCategory>* list = value->items(); @@ -361,7 +361,7 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt element.setAttribute( "xmlns:ns1", "http://schemas.xmlsoap.org/soap/encoding/" ); element.setAttribute( "xsi:type", "ns1:Array" ); element.setAttribute( "ns1:arrayType", "ns1:DirectoryCategory[" + TQString::number( list->count() ) + "]" ); - tqparent.appendChild( element ); + parent.appendChild( element ); TQPtrListIterator<DirectoryCategory> it( *list ); while ( it.current() != 0 ) { @@ -371,11 +371,11 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt } } -void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategoryArray* value ) +void Serializer::demarshal( const TQDomElement &parent, DirectoryCategoryArray* value ) { TQPtrList<DirectoryCategory>* itemsList = new TQPtrList<DirectoryCategory>(); itemsList->setAutoDelete( true ); - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -391,11 +391,11 @@ void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategoryArray value->setItems( itemsList ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const GoogleSearchResult* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const GoogleSearchResult* value ) { TQDomElement root = doc.createElement( name ); root.setAttribute( "xsi:type", "ns1:GoogleSearchResult" ); - tqparent.appendChild( root ); + parent.appendChild( root ); if ( value->documentFiltering() ) { Serializer::marshal( doc, root, "documentFiltering", value->documentFiltering() ); } @@ -431,9 +431,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt } } -void Serializer::demarshal( const TQDomElement &tqparent, GoogleSearchResult* value ) +void Serializer::demarshal( const TQDomElement &parent, GoogleSearchResult* value ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -498,11 +498,11 @@ void Serializer::demarshal( const TQDomElement &tqparent, GoogleSearchResult* va } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategory* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategory* value ) { TQDomElement root = doc.createElement( name ); root.setAttribute( "xsi:type", "ns1:DirectoryCategory" ); - tqparent.appendChild( root ); + parent.appendChild( root ); if ( value->fullViewableName() ) { Serializer::marshal( doc, root, "fullViewableName", value->fullViewableName() ); } @@ -511,9 +511,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt } } -void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategory* value ) +void Serializer::demarshal( const TQDomElement &parent, DirectoryCategory* value ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -533,11 +533,11 @@ void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategory* val } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElement* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElement* value ) { TQDomElement root = doc.createElement( name ); root.setAttribute( "xsi:type", "ns1:ResultElement" ); - tqparent.appendChild( root ); + parent.appendChild( root ); if ( value->summary() ) { Serializer::marshal( doc, root, "summary", value->summary() ); } @@ -567,9 +567,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt } } -void Serializer::demarshal( const TQDomElement &tqparent, ResultElement* value ) +void Serializer::demarshal( const TQDomElement &parent, ResultElement* value ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { diff --git a/kode/kwsdl/tests/google/serializer.h b/kode/kwsdl/tests/google/serializer.h index 4b5ff1921..4519685c6 100644 --- a/kode/kwsdl/tests/google/serializer.h +++ b/kode/kwsdl/tests/google/serializer.h @@ -41,62 +41,62 @@ class Serializer public: static TQString marshalValue( const TQString* value ); static void demarshalValue( const TQString &str, TQString *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQString* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQString* value ); static void demarshal( const TQDomElement &element, TQString* value ); static TQString marshalValue( const bool* value ); static void demarshalValue( const TQString &str, bool *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const bool* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const bool* value ); static void demarshal( const TQDomElement &element, bool* value ); static TQString marshalValue( const float* value ); static void demarshalValue( const TQString &str, float *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const float* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const float* value ); static void demarshal( const TQDomElement &element, float* value ); static TQString marshalValue( const int* value ); static void demarshalValue( const TQString &str, int *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const int* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const int* value ); static void demarshal( const TQDomElement &element, int* value ); static TQString marshalValue( const unsigned int* value ); static void demarshalValue( const TQString &str, unsigned int *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned int* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned int* value ); static void demarshal( const TQDomElement &element, unsigned int* value ); static TQString marshalValue( const double* value ); static void demarshalValue( const TQString &str, double *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const double* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const double* value ); static void demarshal( const TQDomElement &element, double* value ); static TQString marshalValue( const char* value ); static void demarshalValue( const TQString &str, char *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const char* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const char* value ); static void demarshal( const TQDomElement &element, char* value ); static TQString marshalValue( const unsigned char* value ); static void demarshalValue( const TQString &str, unsigned char *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned char* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned char* value ); static void demarshal( const TQDomElement &element, unsigned char* value ); static TQString marshalValue( const short* value ); static void demarshalValue( const TQString &str, short *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const short* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const short* value ); static void demarshal( const TQDomElement &element, short* value ); static TQString marshalValue( const TQByteArray* value ); static void demarshalValue( const TQString &str, TQByteArray *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQByteArray* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQByteArray* value ); static void demarshal( const TQDomElement &element, TQByteArray* value ); static TQString marshalValue( const TQDateTime* value ); static void demarshalValue( const TQString &str, TQDateTime *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDateTime* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDateTime* value ); static void demarshal( const TQDomElement &element, TQDateTime* value ); static TQString marshalValue( const TQDate* value ); static void demarshalValue( const TQString &str, TQDate *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDate* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDate* value ); static void demarshal( const TQDomElement &element, TQDate* value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElementArray* value ); - static void demarshal( const TQDomElement &tqparent, ResultElementArray* value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategoryArray* value ); - static void demarshal( const TQDomElement &tqparent, DirectoryCategoryArray* value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const GoogleSearchResult* value ); - static void demarshal( const TQDomElement &tqparent, GoogleSearchResult* value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategory* value ); - static void demarshal( const TQDomElement &tqparent, DirectoryCategory* value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElement* value ); - static void demarshal( const TQDomElement &tqparent, ResultElement* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElementArray* value ); + static void demarshal( const TQDomElement &parent, ResultElementArray* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategoryArray* value ); + static void demarshal( const TQDomElement &parent, DirectoryCategoryArray* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const GoogleSearchResult* value ); + static void demarshal( const TQDomElement &parent, GoogleSearchResult* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategory* value ); + static void demarshal( const TQDomElement &parent, DirectoryCategory* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElement* value ); + static void demarshal( const TQDomElement &parent, ResultElement* value ); }; diff --git a/kontact/Thoughts b/kontact/Thoughts index 991209a7c..a93d9193b 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -311,7 +311,7 @@ MiB: yes, not too much against DCOP. But for KNotes I thought about turning MiB: a note into a plugin that can be loaded by Kontact and KNotes independently. MiB: like this, there's no DCOP necessary anymore and makes it much more flexible. MiB: e.g. usage of different display configs, a note embedded somewhere and having -MiB: a tqparent or standalone on the desktop. +MiB: a parent or standalone on the desktop. # Communication with external applications is something which doesn't fit too # well with the 'integrated' approach of Kontact. Is this really necessary? @@ -367,7 +367,7 @@ h: there is something else broken IMHO Summary View ------------ h: How would one best integrate a summary view into kontact? -h: a) add a virtual QWidget *summary(const QDateTime&, QWidget* tqparent ); +h: a) add a virtual QWidget *summary(const QDateTime&, QWidget* parent ); h: to get a summary widget for a day? h: b) use some sort of XML to UI to represent the summary informations h: c) have a stand a lone part which opens the PIM data seperately? ( How diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 997ad8c48..e4e44e704 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -37,8 +37,8 @@ public: TQString lastErrorMessage; }; -Core::Core( TQWidget *tqparent, const char *name ) - : KParts::MainWindow( tqparent, name ) +Core::Core( TQWidget *parent, const char *name ) + : KParts::MainWindow( parent, name ) { d = new Private; TQTimer* timer = new TQTimer( this ); diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index 1d7a2a1a4..14248250e 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -53,8 +53,8 @@ class Plugin::Private }; -Plugin::Plugin( Kontact::Core *core, TQObject *tqparent, const char *name ) - : KXMLGUIClient( core ), TQObject( tqparent, name ), d( new Private ) +Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name ) + : KXMLGUIClient( core ), TQObject( parent, name ), d( new Private ) { core->factory()->addClient( this ); KGlobal::locale()->insertCatalogue(name); diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index f0fcc1547..c532f86f1 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -69,7 +69,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient provides the part! This is the name used for DCOP registration. It's ok to have several plugins using the same application name. */ - Plugin( Core *core, TQObject *tqparent, const char *name ); + Plugin( Core *core, TQObject *parent, const char *name ); ~Plugin(); @@ -172,7 +172,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient Reimplement this method if you want to add a widget for your application to Kontact's summary page. */ - virtual Summary *createSummaryWidget( TQWidget * /*tqparent*/ ) { return 0; } + virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; } /** Returns whether the plugin provides a part that should be shown in the sidebar. diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index 4fa495bf1..085125222 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -34,8 +34,8 @@ using namespace Kontact; -Summary::Summary( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +Summary::Summary( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { setAcceptDrops( true ); } @@ -44,9 +44,9 @@ Summary::~Summary() { } -TQWidget* Summary::createHeader(TQWidget *tqparent, const TQPixmap& icon, const TQString& heading) +TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQString& heading) { - TQHBox* hbox = new TQHBox( tqparent ); + TQHBox* hbox = new TQHBox( parent ); hbox->setMargin( 2 ); TQFont boldFont; diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index a845401fc..f6efa3087 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -39,7 +39,7 @@ class KDE_EXPORT Summary : public TQWidget TQ_OBJECT public: - Summary( TQWidget *tqparent, const char *name = 0 ); + Summary( TQWidget *parent, const char *name = 0 ); virtual ~Summary(); @@ -53,7 +53,7 @@ class KDE_EXPORT Summary : public TQWidget /** Creates a heading for a typical summary view with an icon and a heading. */ - TQWidget *createHeader( TQWidget* tqparent, const TQPixmap &icon, + TQWidget *createHeader( TQWidget* parent, const TQPixmap &icon, const TQString& heading ); /** diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 97fc9fad1..989ab6198 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -41,14 +41,14 @@ extern "C" { - KDE_EXPORT KCModule *create_kmailsummary( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kmailsummary( TQWidget *parent, const char * ) { - return new KCMKMailSummary( tqparent, "kcmkmailsummary" ); + return new KCMKMailSummary( parent, "kcmkmailsummary" ); } } -KCMKMailSummary::KCMKMailSummary( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { initGUI(); diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h index 068fa4a8d..025a3f7d1 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.h +++ b/kontact/plugins/kmail/kcmkmailsummary.h @@ -39,7 +39,7 @@ class KCMKMailSummary : public KCModule TQ_OBJECT public: - KCMKMailSummary( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKMailSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 51fceaa61..aa1e205ad 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -174,9 +174,9 @@ bool KMailPlugin::isRunningStandalone() return mUniqueAppWatcher->isRunningStandalone(); } -Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *tqparent ) +Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *parent ) { - return new SummaryWidget( this, tqparent ); + return new SummaryWidget( this, parent ); } //// diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h index 46998d802..9ab74ac2c 100644 --- a/kontact/plugins/kmail/kmail_plugin.h +++ b/kontact/plugins/kmail/kmail_plugin.h @@ -54,7 +54,7 @@ class KMailPlugin : public Kontact::Plugin virtual bool isRunningStandalone(); virtual bool createDCOPInterface( const TQString& serviceType ); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parent ); virtual TQString tipFile() const; int weight() const { return 200; } diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 8f3b668b3..195d853a3 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -41,8 +41,8 @@ #include <time.h> -SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), +SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), DCOPObject( TQCString("MailSummary") ), mPlugin( plugin ) { diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h index 575aceae6..73e27551c 100644 --- a/kontact/plugins/kmail/summarywidget.h +++ b/kontact/plugins/kmail/summarywidget.h @@ -45,7 +45,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name = 0 ); + SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); int summaryHeight() const { return 1; } TQStringList configModules() const; diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index b4b0f7786..004865dce 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -38,8 +38,8 @@ #include "knotetip.h" -KNotesPart::KNotesPart( TQObject *tqparent, const char *name ) - : DCOPObject( "KNotesIface" ), KParts::ReadOnlyPart( tqparent, name ), +KNotesPart::KNotesPart( TQObject *parent, const char *name ) + : DCOPObject( "KNotesIface" ), KParts::ReadOnlyPart( parent, name ), mNotesView( new KNotesIconView() ), mNoteTip( new KNoteTip( mNotesView ) ), mNoteEditDlg( 0 ), diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h index 9bc4e8472..4ab1be70b 100644 --- a/kontact/plugins/knotes/knotes_part.h +++ b/kontact/plugins/knotes/knotes_part.h @@ -50,7 +50,7 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface TQ_OBJECT public: - KNotesPart( TQObject *tqparent = 0, const char *name = 0 ); + KNotesPart( TQObject *parent = 0, const char *name = 0 ); ~KNotesPart(); bool openFile(); diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 9f8a4bb83..a6e23d899 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -60,8 +60,8 @@ class KNotesIconViewItem : public KIconViewItem { public: - KNotesIconViewItem( KIconView *tqparent, KCal::Journal *journal ) - : KIconViewItem( tqparent ), + KNotesIconViewItem( KIconView *parent, KCal::Journal *journal ) + : KIconViewItem( parent ), mJournal( journal ) { setRenameEnabled( true ); @@ -118,9 +118,9 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient TQ_OBJECT public: - KNoteEditDlg( TQWidget *tqparent = 0, const char *name = 0 ) + KNoteEditDlg( TQWidget *parent = 0, const char *name = 0 ) : KDialogBase( Plain, i18n( "Edit Note" ), Ok | Cancel, Ok, - tqparent, name, true, true ) + parent, name, true, true ) { // this dialog is modal to prevent one from editing the same note twice in two // different windows diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index 9e2609fc2..79a45d21e 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -40,11 +40,11 @@ #include "knotes_part_p.h" -KNoteTip::KNoteTip( KIconView *tqparent ) +KNoteTip::KNoteTip( KIconView *parent ) : TQFrame( 0, 0, WX11BypassWM | // this will make Seli happy >:-P WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop ), mFilter( false ), - mView( tqparent ), + mView( parent ), mNoteIVI( 0 ), mPreview( new TQTextEdit( this ) ) { diff --git a/kontact/plugins/knotes/knotetip.h b/kontact/plugins/knotes/knotetip.h index ca342fa43..221720224 100644 --- a/kontact/plugins/knotes/knotetip.h +++ b/kontact/plugins/knotes/knotetip.h @@ -41,7 +41,7 @@ class KNotesIconViewItem; class KNoteTip : public TQFrame { public: - KNoteTip( KIconView *tqparent ); + KNoteTip( KIconView *parent ); ~KNoteTip(); void setNote( KNotesIconViewItem *item ); diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index c0e1ef402..2bd0456ca 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -45,8 +45,8 @@ #include "summarywidget.h" KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin, - TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), mLayout( 0 ), mPlugin( plugin ) + TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), mLayout( 0 ), mPlugin( plugin ) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/knotes/summarywidget.h b/kontact/plugins/knotes/summarywidget.h index 97ccd0940..088bdea3b 100644 --- a/kontact/plugins/knotes/summarywidget.h +++ b/kontact/plugins/knotes/summarywidget.h @@ -46,7 +46,7 @@ class KNotesSummaryWidget : public Kontact::Summary TQ_OBJECT public: - KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name = 0 ); + KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); void updateSummary( bool force = false ) { Q_UNUSED( force ); updateView(); } diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 9e698a2bd..7aa684f45 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -41,14 +41,14 @@ extern "C" { - KDE_EXPORT KCModule *create_korgsummary( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_korgsummary( TQWidget *parent, const char * ) { - return new KCMKOrgSummary( tqparent, "kcmkorgsummary" ); + return new KCMKOrgSummary( parent, "kcmkorgsummary" ); } } -KCMKOrgSummary::KCMKOrgSummary( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { initGUI(); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h index 6d19f30f3..ea698f91a 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.h +++ b/kontact/plugins/korganizer/kcmkorgsummary.h @@ -35,7 +35,7 @@ class KCMKOrgSummary : public KCModule TQ_OBJECT public: - KCMKOrgSummary( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKOrgSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index d626c9519..beba17382 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -80,14 +80,14 @@ KOrganizerPlugin::~KOrganizerPlugin() { } -Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *tqparent ) +Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *parent ) { // korg part must be loaded, otherwise when starting kontact on summary view // it won't display our stuff. // If the part is already loaded loadPart() is harmless and just returns loadPart(); - return new SummaryWidget( this, tqparent ); + return new SummaryWidget( this, parent ); } KParts::ReadOnlyPart *KOrganizerPlugin::createPart() diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h index 4aaa4a0b6..83abfa914 100644 --- a/kontact/plugins/korganizer/korganizerplugin.h +++ b/kontact/plugins/korganizer/korganizerplugin.h @@ -51,7 +51,7 @@ class KOrganizerPlugin : public Kontact::Plugin bool canDecodeDrag( TQMimeSource * ); void processDropEvent( TQDropEvent * ); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parent ); virtual TQString tipFile() const; virtual TQStringList invisibleToolbarActions() const; diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 03be389c2..b3f73fdf2 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -50,9 +50,9 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *tqparent, +SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, const char *name ) - : Kontact::Summary( tqparent, name ), mPlugin( plugin ), mCalendar( 0 ) + : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h index 9e2350ead..1f7df4f1f 100644 --- a/kontact/plugins/korganizer/summarywidget.h +++ b/kontact/plugins/korganizer/summarywidget.h @@ -42,7 +42,7 @@ class SummaryWidget : public Kontact::Summary TQ_OBJECT public: - SummaryWidget( KOrganizerPlugin *plugin, TQWidget *tqparent, + SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, const char *name = 0 ); ~SummaryWidget(); diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index 6b6238bfe..fa788778e 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -77,9 +77,9 @@ TodoPlugin::~TodoPlugin() { } -Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *tqparent ) +Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *parent ) { - return new TodoSummaryWidget( this, tqparent ); + return new TodoSummaryWidget( this, parent ); } KParts::ReadOnlyPart *TodoPlugin::createPart() diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h index 9bff00d0b..4d2896cd2 100644 --- a/kontact/plugins/korganizer/todoplugin.h +++ b/kontact/plugins/korganizer/todoplugin.h @@ -48,7 +48,7 @@ class TodoPlugin : public Kontact::Plugin virtual TQStringList invisibleToolbarActions() const; - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parent ); void select(); diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 1109f314a..8d78d3725 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -53,8 +53,8 @@ #include "todosummarywidget.h" TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin, - TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), mPlugin( plugin ) + TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), mPlugin( plugin ) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); @@ -152,7 +152,7 @@ void TodoSummaryWidget::updateView() mLabels.append( label ); TQString sSummary = todo->summary(); - if ( todo->relatedTo() ) { // show tqparent only, not entire ancestry + if ( todo->relatedTo() ) { // show parent only, not entire ancestry sSummary = todo->relatedTo()->summary() + ":" + todo->summary(); } KURLLabel *urlLabel = new KURLLabel( this ); diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h index 974a45b30..e8374edc1 100644 --- a/kontact/plugins/korganizer/todosummarywidget.h +++ b/kontact/plugins/korganizer/todosummarywidget.h @@ -42,7 +42,7 @@ class TodoSummaryWidget : public Kontact::Summary TQ_OBJECT public: - TodoSummaryWidget( TodoPlugin *plugin, TQWidget *tqparent, + TodoSummaryWidget( TodoPlugin *plugin, TQWidget *parent, const char *name = 0 ); ~TodoSummaryWidget(); diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index a0dafaa29..c2f4739c9 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -49,8 +49,8 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), +SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), DCOPObject( "KPilotSummaryWidget" ), mDCOPSuccess( false ), mStartedDaemon( false ), diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h index cfb87ae56..b1b60a053 100644 --- a/kontact/plugins/kpilot/summarywidget.h +++ b/kontact/plugins/kpilot/summarywidget.h @@ -49,7 +49,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( TQWidget *tqparent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = 0 ); virtual ~SummaryWidget(); int summaryHeight() const { return 1; } diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 63dc312e2..6795ffb5b 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -49,15 +49,15 @@ extern "C" { - KDE_EXPORT KCModule *create_kontactknt( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kontactknt( TQWidget *parent, const char * ) { - return new KCMKontactKNT( tqparent, "kcmkontactknt" ); + return new KCMKontactKNT( parent, "kcmkontactknt" ); } } -NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *tqparent ) +NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *parent ) : KDialogBase( Plain, i18n( "New News Feed" ), Ok | Cancel, - Ok, tqparent, 0, true, true ) + Ok, parent, 0, true, true ) { TQWidget *page = plainPage(); TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(), @@ -106,14 +106,14 @@ TQString NewsEditDialog::url() const class NewsItem : public TQListViewItem { public: - NewsItem( TQListView *tqparent, const TQString& title, const TQString& url, bool custom ) - : TQListViewItem( tqparent ), mTitle( title ), mUrl( url ), mCustom( custom ) + NewsItem( TQListView *parent, const TQString& title, const TQString& url, bool custom ) + : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom ) { setText( 0, mTitle ); } - NewsItem( TQListViewItem *tqparent, const TQString& title, const TQString& url, bool custom ) - : TQListViewItem( tqparent ), mTitle( title ), mUrl( url ), mCustom( custom ) + NewsItem( TQListViewItem *parent, const TQString& title, const TQString& url, bool custom ) + : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom ) { setText( 0, mTitle ); } @@ -128,8 +128,8 @@ class NewsItem : public TQListViewItem bool mCustom; }; -KCMKontactKNT::KCMKontactKNT( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { initGUI(); diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h index 2ec21f863..7bb00c7e8 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.h +++ b/kontact/plugins/newsticker/kcmkontactknt.h @@ -41,7 +41,7 @@ class KCMKontactKNT : public KCModule TQ_OBJECT public: - KCMKontactKNT( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKontactKNT( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); @@ -89,7 +89,7 @@ class NewsEditDialog : public KDialogBase TQ_OBJECT public: - NewsEditDialog( const TQString&, const TQString&, TQWidget *tqparent ); + NewsEditDialog( const TQString&, const TQString&, TQWidget *parent ); TQString title() const; TQString url() const; diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 3667d402c..2ba0dfcfa 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -41,8 +41,8 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), +SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), DCOPObject( "NewsTickerPlugin" ), mLayout( 0 ), mFeedCounter( 0 ) { TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h index 7f30ca267..4a7c5c45f 100644 --- a/kontact/plugins/newsticker/summarywidget.h +++ b/kontact/plugins/newsticker/summarywidget.h @@ -60,7 +60,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( TQWidget *tqparent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = 0 ); int summaryHeight() const; TQStringList configModules() const; diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index 3c3420820..b659cdb45 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -43,14 +43,14 @@ extern "C" { - KDE_EXPORT KCModule *create_sdsummary( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_sdsummary( TQWidget *parent, const char * ) { - return new KCMSDSummary( tqparent, "kcmsdsummary" ); + return new KCMSDSummary( parent, "kcmsdsummary" ); } } -KCMSDSummary::KCMSDSummary( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { initGUI(); diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h index 4369797f4..7e18f2195 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.h +++ b/kontact/plugins/specialdates/kcmsdsummary.h @@ -39,7 +39,7 @@ class KCMSDSummary : public KCModule TQ_OBJECT public: - KCMSDSummary( TQWidget *tqparent = 0, const char *name = 0 ); + KCMSDSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 3a5f8b3a7..537e4ec0d 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -77,9 +77,9 @@ class SDEntry } }; -SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, +SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name ) - : Kontact::Summary( tqparent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 ) + : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 ) { // Create the Summary Layout TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h index 939ca5bb9..00f45a5d8 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.h +++ b/kontact/plugins/specialdates/sdsummarywidget.h @@ -46,7 +46,7 @@ class SDSummaryWidget : public Kontact::Summary TQ_OBJECT public: - SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, + SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); TQStringList configModules() const; diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp index 300d7993d..63c1d3ceb 100644 --- a/kontact/plugins/summary/dropwidget.cpp +++ b/kontact/plugins/summary/dropwidget.cpp @@ -23,8 +23,8 @@ #include "dropwidget.h" -DropWidget::DropWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +DropWidget::DropWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { setAcceptDrops( true ); } diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h index ee430d90c..e2d11c9ee 100644 --- a/kontact/plugins/summary/dropwidget.h +++ b/kontact/plugins/summary/dropwidget.h @@ -30,7 +30,7 @@ class DropWidget : public TQWidget TQ_OBJECT public: - DropWidget( TQWidget *tqparent, const char *name = 0 ); + DropWidget( TQWidget *parent, const char *name = 0 ); signals: void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment ); diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index a2b5003b3..156014ca0 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -43,16 +43,16 @@ extern "C" { - KDE_EXPORT KCModule *create_kontactsummary( TQWidget *tqparent, const char * ) { - return new KCMKontactSummary( tqparent, "kcmkontactsummary" ); + KDE_EXPORT KCModule *create_kontactsummary( TQWidget *parent, const char * ) { + return new KCMKontactSummary( parent, "kcmkontactsummary" ); } } class PluginItem : public TQCheckListItem { public: - PluginItem( KPluginInfo *info, KListView *tqparent ) - : TQCheckListItem( tqparent, TQString(), TQCheckListItem::CheckBox ), + PluginItem( KPluginInfo *info, KListView *parent ) + : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ), mInfo( info ) { TQPixmap pm = KGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small ); @@ -78,8 +78,8 @@ class PluginItem : public TQCheckListItem KPluginInfo *mInfo; }; -PluginView::PluginView( TQWidget *tqparent, const char *name ) - : KListView( tqparent, name ) +PluginView::PluginView( TQWidget *parent, const char *name ) + : KListView( parent, name ) { addColumn( i18n( "Name" ) ); setAllColumnsShowFocus( true ); @@ -90,8 +90,8 @@ PluginView::~PluginView() { } -KCMKontactSummary::KCMKontactSummary( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h index 4545f16d3..33c9b8f08 100644 --- a/kontact/plugins/summary/kcmkontactsummary.h +++ b/kontact/plugins/summary/kcmkontactsummary.h @@ -36,7 +36,7 @@ class PluginView : public KListView TQ_OBJECT public: - PluginView( TQWidget *tqparent, const char *name = 0 ); + PluginView( TQWidget *parent, const char *name = 0 ); ~PluginView(); }; @@ -46,7 +46,7 @@ class KCMKontactSummary : public KCModule TQ_OBJECT public: - KCMKontactSummary( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKontactSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index f9dbd83e6..d65228cd1 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -67,8 +67,8 @@ namespace Kontact SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, const KAboutData *aboutData, - TQObject *tqparent, const char *name ) - : KParts::ReadOnlyPart( tqparent, name ), + TQObject *parent, const char *name ) + : KParts::ReadOnlyPart( parent, name ), mCore( core ), mFrame( 0 ), mConfigAction( 0 ) { setInstance( new KInstance( aboutData ) ); diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index b04b944a0..5a99b947d 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -57,7 +57,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart public: SummaryViewPart( Kontact::Core *core, const char *widgetName, const KAboutData *aboutData, - TQObject *tqparent = 0, const char *name = 0 ); + TQObject *parent = 0, const char *name = 0 ); ~SummaryViewPart(); public slots: diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index 93311c7d2..3c900a535 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -41,8 +41,8 @@ #include <kservice.h> -TestPart::TestPart(TQObject *tqparent, const char *name) // ## parentWidget - : KParts::ReadOnlyPart(tqparent, name) +TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget + : KParts::ReadOnlyPart(parent, name) { setInstance( new KInstance("testpart") ); // ## memleak m_edit = new TQTextEdit; diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h index 7f14aed27..1be87ddea 100644 --- a/kontact/plugins/test/test_part.h +++ b/kontact/plugins/test/test_part.h @@ -38,7 +38,7 @@ class TestPart : public KParts::ReadOnlyPart public: - TestPart(TQObject *tqparent=0, const char *name=0); + TestPart(TQObject *parent=0, const char *name=0); ~TestPart(); protected: diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index 611a7c1c6..bf4d452ad 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -38,8 +38,8 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), +SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), DCOPObject( "WeatherSummaryWidget" ), mProc( 0 ) { mLayout = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h index be1c5b9cf..b47351511 100644 --- a/kontact/plugins/weather/summarywidget.h +++ b/kontact/plugins/weather/summarywidget.h @@ -90,7 +90,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject // TQ_OBJECT K_DCOP public: - SummaryWidget( TQWidget *tqparent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = 0 ); TQStringList configModules() const; diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 85e7e7a4f..4eacd6088 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -92,8 +92,8 @@ class PluginProxy using namespace Kontact; -EntryItem::EntryItem( Navigator *tqparent, Kontact::Plugin *plugin ) - : TQListBoxItem( tqparent ), +EntryItem::EntryItem( Navigator *parent, Kontact::Plugin *plugin ) + : TQListBoxItem( parent ), mPlugin( plugin ), mHasHover( false ), mPaintActive( false ) @@ -250,8 +250,8 @@ void EntryItem::setPaintActive( bool paintActive ) mPaintActive = paintActive; } -Navigator::Navigator( IconSidePane *tqparent, const char *name ) - : KListBox( tqparent, name ), mSidePane( tqparent ), +Navigator::Navigator( IconSidePane *parent, const char *name ) + : KListBox( parent, name ), mSidePane( parent ), mShowIcons( true ), mShowText( true ) { mMouseOn = 0; @@ -535,8 +535,8 @@ void Navigator::slotMouseOff() slotMouseOn( 0 ); } -IconSidePane::IconSidePane( Core *core, TQWidget *tqparent, const char *name ) - : SidePaneBase( core, tqparent, name ) +IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name ) + : SidePaneBase( core, parent, name ) { mNavigator = new Navigator( this ); connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ), diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h index d7cc532da..d215558df 100644 --- a/kontact/src/iconsidepane.h +++ b/kontact/src/iconsidepane.h @@ -91,8 +91,8 @@ class EntryItem : public TQListBoxItem class EntryItemToolTip : public TQToolTip { public: - EntryItemToolTip( TQListBox* tqparent ) - : TQToolTip( tqparent->viewport() ), mListBox( tqparent ) + EntryItemToolTip( TQListBox* parent ) + : TQToolTip( parent->viewport() ), mListBox( parent ) {} protected: void maybeTip( const TQPoint& p ) { @@ -120,7 +120,7 @@ class Navigator : public KListBox Q_OBJECT TQ_OBJECT public: - Navigator( IconSidePane *tqparent = 0, const char *name = 0 ); + Navigator( IconSidePane *parent = 0, const char *name = 0 ); virtual void setSelected( TQListBoxItem *, bool ); @@ -176,7 +176,7 @@ class IconSidePane : public SidePaneBase Q_OBJECT TQ_OBJECT public: - IconSidePane( Core *core, TQWidget *tqparent, const char *name = 0 ); + IconSidePane( Core *core, TQWidget *parent, const char *name = 0 ); ~IconSidePane(); virtual void indicateForegrunding( Kontact::Plugin* ); diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index fbdd4a045..03c59d65c 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -42,16 +42,16 @@ extern "C" { - KDE_EXPORT KCModule *create_kontactconfig( TQWidget *tqparent, const char * ) { - return new KcmKontact( tqparent, "kcmkontact" ); + KDE_EXPORT KCModule *create_kontactconfig( TQWidget *parent, const char * ) { + return new KcmKontact( parent, "kcmkontact" ); } } class PluginItem : public TQListViewItem { public: - PluginItem( TQListView *tqparent, const KService::Ptr &ptr ) - : TQListViewItem( tqparent, ptr->name(), ptr->comment(), ptr->library() ), + PluginItem( TQListView *parent, const KService::Ptr &ptr ) + : TQListViewItem( parent, ptr->name(), ptr->comment(), ptr->library() ), mPtr( ptr ) { } @@ -65,8 +65,8 @@ class PluginItem : public TQListViewItem KService::Ptr mPtr; }; -KcmKontact::KcmKontact( TQWidget *tqparent, const char *name ) - : KPrefsModule( Kontact::Prefs::self(), tqparent, name ) +KcmKontact::KcmKontact( TQWidget *parent, const char *name ) + : KPrefsModule( Kontact::Prefs::self(), parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); TQBoxLayout *pluginStartupLayout = new TQHBoxLayout( topLayout ); @@ -100,10 +100,10 @@ const KAboutData* KcmKontact::aboutData() const } -PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *tqparent ) +PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent ) { mItem = item; - mPluginCombo = new TQComboBox( tqparent ); + mPluginCombo = new TQComboBox( parent ); connect( mPluginCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); } diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h index 1d3f04a6f..0bb8cb47a 100644 --- a/kontact/src/kcmkontact.h +++ b/kontact/src/kcmkontact.h @@ -42,7 +42,7 @@ class KcmKontact : public KPrefsModule TQ_OBJECT public: - KcmKontact( TQWidget *tqparent = 0, const char *name = 0 ); + KcmKontact( TQWidget *parent = 0, const char *name = 0 ); virtual const KAboutData* aboutData() const; }; @@ -53,7 +53,7 @@ class PluginSelection : public KPrefsWid TQ_OBJECT public: - PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *tqparent ); + PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent ); ~PluginSelection(); void readConfig(); diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index b719a57d5..e30975ec6 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -87,8 +87,8 @@ using namespace Kontact; class SettingsDialogWrapper : public KSettings::Dialog { public: - SettingsDialogWrapper( ContentInListView content, TQWidget * tqparent = 0 ) - : KSettings::Dialog( content, tqparent, 0 ) + SettingsDialogWrapper( ContentInListView content, TQWidget * parent = 0 ) + : KSettings::Dialog( content, parent, 0 ) { } @@ -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->parentWidget(); - while ( tqparent ) { - if ( tqparent == mCurrentPlugin->part()->widget() ) + TQWidget *parent = tqfocusWidget->parentWidget(); + while ( parent ) { + if ( parent == mCurrentPlugin->part()->widget() ) mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) ); - tqparent = tqparent->parentWidget(); + parent = parent->parentWidget(); } } diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index bc3bff990..c58377806 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -34,7 +34,7 @@ #include <tqpushbutton.h> #include <tqstring.h> -Kontact::ProfileDialog::ProfileDialog( TQWidget* tqparent, WFlags flags ) : KDialogBase( tqparent, /*name=*/0, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close ) +Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialogBase( parent, /*name=*/0, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close ) { setWFlags( flags ); setCaption( i18n("Configure Profiles") ); diff --git a/kontact/src/profiledialog.h b/kontact/src/profiledialog.h index fc9559b5c..dc0aee034 100644 --- a/kontact/src/profiledialog.h +++ b/kontact/src/profiledialog.h @@ -43,7 +43,7 @@ Q_OBJECT TQ_OBJECT public: - explicit ProfileDialog( TQWidget* tqparent = 0, WFlags f = 0 ); + explicit ProfileDialog( TQWidget* parent = 0, WFlags f = 0 ); private: enum ListColumn { diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 50b2a71d4..91fc370db 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -131,7 +131,7 @@ Kontact::ProfileManager* Kontact::ProfileManager::self() return m_self; } -Kontact::ProfileManager::ProfileManager( TQObject* tqparent ) : TQObject( tqparent ) +Kontact::ProfileManager::ProfileManager( TQObject* parent ) : TQObject( parent ) { } diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h index b7abdcb3f..2224b29f5 100644 --- a/kontact/src/profilemanager.h +++ b/kontact/src/profilemanager.h @@ -146,7 +146,7 @@ private: static Kontact::Profile readFromConfiguration( const TQString& configFile, bool isLocal ); - explicit ProfileManager( TQObject* tqparent = 0 ); + explicit ProfileManager( TQObject* parent = 0 ); void readConfig(); diff --git a/kontact/src/sidepanebase.cpp b/kontact/src/sidepanebase.cpp index 486e273ba..92a3ce510 100644 --- a/kontact/src/sidepanebase.cpp +++ b/kontact/src/sidepanebase.cpp @@ -25,8 +25,8 @@ using namespace Kontact; -SidePaneBase::SidePaneBase( Core *core, TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ), mCore( core ) +SidePaneBase::SidePaneBase( Core *core, TQWidget *parent, const char *name ) + : TQVBox( parent, name ), mCore( core ) { } diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h index 77acc66f7..6942ac8b4 100644 --- a/kontact/src/sidepanebase.h +++ b/kontact/src/sidepanebase.h @@ -36,7 +36,7 @@ class SidePaneBase : public TQVBox Q_OBJECT TQ_OBJECT public: - SidePaneBase( Core *core, TQWidget *tqparent, const char *name = 0 ); + SidePaneBase( Core *core, TQWidget *parent, const char *name = 0 ); virtual ~SidePaneBase(); signals: diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index cbb4e42f8..c8eefde52 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -81,9 +81,9 @@ KOWindowList *ActionManager::mWindowList = 0; ActionManager::ActionManager( KXMLGUIClient *client, CalendarView *widget, - TQObject *tqparent, KOrg::MainWindow *mainWindow, + TQObject *parent, KOrg::MainWindow *mainWindow, bool isPart ) - : TQObject( tqparent ), KCalendarIface(), mRecent( 0 ), + : TQObject( parent ), KCalendarIface(), mRecent( 0 ), mResourceButtonsAction( 0 ), mResourceViewShowAction( 0 ), mCalendar( 0 ), mCalendarResources( 0 ), mResourceView( 0 ), mIsClosing( false ) { @@ -130,7 +130,7 @@ void ActionManager::init() TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( showTipOnStart() ) ); } // Note: We need this ActionManager to be fully constructed, and - // tqparent() to have a valid reference to it before the following + // parent() to have a valid reference to it before the following // addWindow is called. mWindowList->addWindow( mMainWindow ); diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h index 0a53255f4..6ee1727fa 100644 --- a/korganizer/actionmanager.h +++ b/korganizer/actionmanager.h @@ -76,7 +76,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface TQ_OBJECT public: ActionManager( KXMLGUIClient *client, CalendarView *widget, - TQObject *tqparent, KOrg::MainWindow *mainWindow, + TQObject *parent, KOrg::MainWindow *mainWindow, bool isPart ); virtual ~ActionManager(); @@ -357,7 +357,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface void initCalendar( Calendar *cal ); /** - Return widget used as tqparent for dialogs and message boxes. + Return widget used as parent for dialogs and message boxes. */ TQWidget *dialogParent(); diff --git a/korganizer/agendaview.cpp b/korganizer/agendaview.cpp index f2d7f9879..df1417897 100644 --- a/korganizer/agendaview.cpp +++ b/korganizer/agendaview.cpp @@ -22,8 +22,8 @@ using namespace KOrg; -AgendaView::AgendaView(Calendar * cal, TQWidget * tqparent, const char * name) : - KOEventView( cal, tqparent, name ) +AgendaView::AgendaView(Calendar * cal, TQWidget * parent, const char * name) : + KOEventView( cal, parent, name ) { KCal::CalendarResources *calres = dynamic_cast<KCal::CalendarResources*>( cal ); if ( calres ) { diff --git a/korganizer/agendaview.h b/korganizer/agendaview.h index 83ef5e6ac..1ed1937ac 100644 --- a/korganizer/agendaview.h +++ b/korganizer/agendaview.h @@ -29,7 +29,7 @@ class AgendaView : public KOEventView Q_OBJECT TQ_OBJECT public: - AgendaView( Calendar *cal,TQWidget *tqparent=0,const char *name=0 ); + AgendaView( Calendar *cal,TQWidget *parent=0,const char *name=0 ); virtual void setTypeAheadReceiver( TQObject * ) = 0; diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp index f96761615..72898d954 100644 --- a/korganizer/archivedialog.cpp +++ b/korganizer/archivedialog.cpp @@ -51,9 +51,9 @@ #include <tqradiobutton.h> #include "archivedialog.moc" -ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *tqparent, const char *name) +ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name) : KDialogBase (Plain,i18n("Archive/Delete Past Events and To-dos"), - User1|Cancel,User1,tqparent,name,false,true, + User1|Cancel,User1,parent,name,false,true, i18n("&Archive")) { mCalendar = cal; diff --git a/korganizer/archivedialog.h b/korganizer/archivedialog.h index c63194091..897123b01 100644 --- a/korganizer/archivedialog.h +++ b/korganizer/archivedialog.h @@ -43,7 +43,7 @@ class ArchiveDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ArchiveDialog(Calendar *calendar,TQWidget *tqparent=0, const char *name=0); + ArchiveDialog(Calendar *calendar,TQWidget *parent=0, const char *name=0); virtual ~ArchiveDialog(); signals: diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index e5203ae1b..5b6d94928 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -112,8 +112,8 @@ using namespace KOrg; -CalendarView::CalendarView( TQWidget *tqparent, const char *name ) - : CalendarViewBase( tqparent, name ), +CalendarView::CalendarView( TQWidget *parent, const char *name ) + : CalendarViewBase( parent, name ), mHistory( 0 ), mCalendar( CalendarNull::self() ), mChanger( 0 ) @@ -456,13 +456,13 @@ bool CalendarView::openCalendar(const TQString& filename, bool merge) i18n( "No calendars found, unable to merge the file into your calendar." ) ); return false; } - // FIXME: This is a nasty hack, since we need to set a tqparent for the + // FIXME: This is a nasty hack, since we need to set a parent for the // resource selection dialog. However, we don't have any UI methods // in the calendar, only in the CalendarResources::DestinationPolicy // So we need to type-cast it and extract it from the CalendarResources - TQWidget *tmptqparent = 0; + TQWidget *tmpparent = 0; if ( cl ) { - tmptqparent = cl->dialogParentWidget(); + tmpparent = cl->dialogParentWidget(); cl->setDialogParentWidget( this ); } @@ -2216,13 +2216,13 @@ bool CalendarView::editIncidence( Incidence *incidence, const TQDate &date, bool return false; } - // FIXME: This is a nasty hack, since we need to set a tqparent for the + // FIXME: This is a nasty hack, since we need to set a parent for the // resource selection dialog. However, we don't have any UI methods // in the calendar, only in the CalendarResources::DestinationPolicy // So we need to type-cast it and extract it from the CalendarResources - TQWidget *tmptqparent = 0; + TQWidget *tmpparent = 0; if ( stdcal ) { - tmptqparent = stdcal->dialogParentWidget(); + tmpparent = stdcal->dialogParentWidget(); stdcal->setDialogParentWidget( this ); } @@ -2343,7 +2343,7 @@ void CalendarView::deleteTodoIncidence ( Todo *todo, bool force ) // Delete only the father if( km == KMessageBox::Yes ) { // Instead of making a subto-do independent, why not relate - // it to it's dead father's tqparent? + // it to it's dead father's parent? makeChildrenIndependent ( todo ); mChanger->deleteIncidence( todo, this ); } else if ( km == KMessageBox::No ) { diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 2c5aeec50..9a180bb02 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -59,13 +59,13 @@ using namespace KCal; class CalendarViewExtension : public TQWidget { public: - CalendarViewExtension( TQWidget *tqparent, const char *name = 0 ) - : TQWidget( tqparent, name ) {} + CalendarViewExtension( TQWidget *parent, const char *name = 0 ) + : TQWidget( parent, name ) {} class Factory { public: - virtual CalendarViewExtension *create( TQWidget *tqparent ) = 0; + virtual CalendarViewExtension *create( TQWidget *parent ) = 0; }; }; @@ -86,10 +86,10 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: /** Constructs a new calendar view widget. - @param tqparent tqparent window + @param parent parent window @param name TQt internal widget object name */ - CalendarView( TQWidget *tqparent = 0, const char *name = 0 ); + CalendarView( TQWidget *parent = 0, const char *name = 0 ); virtual ~CalendarView(); class CalendarViewVisitor : public IncidenceBase::Visitor @@ -346,9 +346,9 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: /** create new todo, due on date */ void newTodo( ResourceCalendar *res, const TQString &subRes, const TQDate &date ); - /** create new todo with a tqparent todo */ + /** create new todo with a parent todo */ void newSubTodo(); - /** create new todo with a tqparent todo */ + /** create new todo with a parent todo */ void newSubTodo( Todo * ); void newTodo( ResourceCalendar *res, const TQString &subRes, @@ -658,7 +658,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: // uncompleted subitems), notAllPurged is set to true. bool purgeCompletedSubTodos( Todo* todo, bool ¬AllPurged ); - /** Returns all incidences having inc has their tqparent (or grand tqparent, etc.) + /** Returns all incidences having inc has their parent (or grand parent, etc.) inc is included in the list too. */ void getIncidenceHierarchy( Incidence *inc, Incidence::List &incidences ); diff --git a/korganizer/customlistviewitem.h b/korganizer/customlistviewitem.h index ecf098121..0a8aa7fe9 100644 --- a/korganizer/customlistviewitem.h +++ b/korganizer/customlistviewitem.h @@ -32,10 +32,10 @@ template<class T> class CustomListViewItem : public KListViewItem { public: - CustomListViewItem( T data, KListView *tqparent ) : - KListViewItem( tqparent ), mData( data ) { updateItem(); }; - CustomListViewItem( T data, KListView *tqparent, KListViewItem* after ) : - KListViewItem( tqparent, after ), mData( data ) { updateItem(); }; + CustomListViewItem( T data, KListView *parent ) : + KListViewItem( parent ), mData( data ) { updateItem(); }; + CustomListViewItem( T data, KListView *parent, KListViewItem* after ) : + KListViewItem( parent, after ), mData( data ) { updateItem(); }; ~CustomListViewItem() {}; void updateItem() {}; diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp index 0862a8604..c311743eb 100644 --- a/korganizer/datechecker.cpp +++ b/korganizer/datechecker.cpp @@ -31,8 +31,8 @@ #include "datechecker.h" -DateChecker::DateChecker( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), mUpdateTimer( 0 ) +DateChecker::DateChecker( TQObject *parent, const char *name ) + : TQObject( parent, name ), mUpdateTimer( 0 ) { enableRollover( FollowMonth ); } diff --git a/korganizer/datechecker.h b/korganizer/datechecker.h index dc70d01c2..67ada0737 100644 --- a/korganizer/datechecker.h +++ b/korganizer/datechecker.h @@ -39,7 +39,7 @@ class DateChecker: public TQObject Q_OBJECT TQ_OBJECT public: - DateChecker( TQObject *tqparent = 0, const char *name = 0 ); + DateChecker( TQObject *parent = 0, const char *name = 0 ); ~DateChecker(); /** diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index 4baaf9b86..a792b8416 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp @@ -34,8 +34,8 @@ using namespace KCal; -DateNavigator::DateNavigator( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +DateNavigator::DateNavigator( TQObject *parent, const char *name ) + : TQObject( parent, name ) { mSelectedDates.append( TQDate::tqcurrentDate() ); } @@ -150,10 +150,10 @@ void DateNavigator::selectWorkWeek( const TQDate &d ) } mSelectedDates.clear(); - int tqmask = KOGlobals::self()->getWorkWeekMask(); + int mask = KOGlobals::self()->getWorkWeekMask(); for ( int i = 0; i < 7; ++i ) { - if( (1<< ((i + weekStart + 6) % 7)) & (tqmask) ) { + if( (1<< ((i + weekStart + 6) % 7)) & (mask) ) { mSelectedDates.append( tqcurrentDate.addDays(i) ); } } diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h index d2a28bb60..2f827a278 100644 --- a/korganizer/datenavigator.h +++ b/korganizer/datenavigator.h @@ -38,7 +38,7 @@ class DateNavigator : public TQObject Q_OBJECT TQ_OBJECT public: - DateNavigator( TQObject *tqparent = 0, const char *name = 0 ); + DateNavigator( TQObject *parent = 0, const char *name = 0 ); ~DateNavigator(); KCal::DateList selectedDates(); diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 055111acf..5504e8f65 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -39,9 +39,9 @@ #include <tqwhatsthis.h> #include <tqtimer.h> -DateNavigatorContainer::DateNavigatorContainer( TQWidget *tqparent, +DateNavigatorContainer::DateNavigatorContainer( TQWidget *parent, const char *name ) - : TQFrame( tqparent, name ), mCalendar( 0 ), + : TQFrame( parent, name ), mCalendar( 0 ), mHorizontalCount( 1 ), mVerticalCount( 1 ) { mExtraViews.setAutoDelete( true ); diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h index f61a1d363..ae8f22a25 100644 --- a/korganizer/datenavigatorcontainer.h +++ b/korganizer/datenavigatorcontainer.h @@ -34,7 +34,7 @@ class DateNavigatorContainer: public TQFrame Q_OBJECT TQ_OBJECT public: - DateNavigatorContainer( TQWidget *tqparent = 0, const char *name = 0 ); + DateNavigatorContainer( TQWidget *parent = 0, const char *name = 0 ); ~DateNavigatorContainer(); /** diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp index 1738380b1..ac0cef045 100644 --- a/korganizer/eventarchiver.cpp +++ b/korganizer/eventarchiver.cpp @@ -36,8 +36,8 @@ #include <kdebug.h> #include "koprefs.h" -EventArchiver::EventArchiver( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +EventArchiver::EventArchiver( TQObject* parent, const char* name ) + : TQObject( parent, name ) { } diff --git a/korganizer/eventarchiver.h b/korganizer/eventarchiver.h index 8da86debf..f5b61e6df 100644 --- a/korganizer/eventarchiver.h +++ b/korganizer/eventarchiver.h @@ -50,14 +50,14 @@ class EventArchiver : public TQObject TQ_OBJECT public: - EventArchiver( TQObject* tqparent = 0, const char* name = 0 ); + EventArchiver( TQObject* parent = 0, const char* name = 0 ); virtual ~EventArchiver(); /** * Delete or archive events once * @param calendar the calendar to archive * @param limitDate all events *before* the limitDate (not included) will be deleted/archived. - * @param widget tqparent widget for message boxes + * @param widget parent widget for message boxes * Confirmation and "no events to process" dialogs will be shown */ void runOnce( Calendar* calendar, const TQDate& limitDate, TQWidget* widget ); @@ -65,7 +65,7 @@ class EventArchiver : public TQObject /** * Delete or archive events. This is called regularly, when auto-archiving is enabled * @param calendar the calendar to archive - * @param widget tqparent widget for message boxes + * @param widget parent widget for message boxes * @param withGUI whether this is called from the dialog, so message boxes should be shown. * Note that error dialogs like "cannot save" are shown even if from this method, so widget * should be set in all cases. diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp index 0e514abde..37da6ea23 100644 --- a/korganizer/exportwebdialog.cpp +++ b/korganizer/exportwebdialog.cpp @@ -68,9 +68,9 @@ // because we want custom buttons, a Tabbed dialog, and a different // headline... Maybe we should try to achieve the same without code // duplication. -ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *tqparent, +ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent, const char *name) - : KDialogBase( Tabbed,i18n("Export Calendar as Web Page"),Help|Default|User1|Cancel, User1, tqparent, name, false, false, i18n("Export") ), + : KDialogBase( Tabbed,i18n("Export Calendar as Web Page"),Help|Default|User1|Cancel, User1, parent, name, false, false, i18n("Export") ), KPrefsWidManager( settings ), mSettings( settings ) { setupGeneralPage(); diff --git a/korganizer/exportwebdialog.h b/korganizer/exportwebdialog.h index 53b8f09cc..7157483e1 100644 --- a/korganizer/exportwebdialog.h +++ b/korganizer/exportwebdialog.h @@ -40,7 +40,7 @@ class ExportWebDialog : public KDialogBase, public KPrefsWidManager Q_OBJECT TQ_OBJECT public: - ExportWebDialog( HTMLExportSettings *settings, TQWidget *tqparent = 0, + ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent = 0, const char *name = 0 ); virtual ~ExportWebDialog(); diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index 02e6053e1..970fd9541 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp @@ -47,8 +47,8 @@ #include "filtereditdialog.moc" FilterEditDialog::FilterEditDialog( TQPtrList<CalFilter> *filters, - TQWidget *tqparent, const char *name) - : KDialogBase( tqparent, name, false, i18n("Edit Calendar Filters"), + TQWidget *parent, const char *name) + : KDialogBase( parent, name, false, i18n("Edit Calendar Filters"), Ok | Apply | Cancel ) { setMainWidget( mFilterEdit = new FilterEdit(filters, this)); @@ -92,8 +92,8 @@ void FilterEditDialog::setDialogConsistent(bool consistent) { enableButtonApply( consistent ); } -FilterEdit::FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *tqparent) - : FilterEdit_base( tqparent), current(0), mCategorySelectDialog( 0 ) +FilterEdit::FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent) + : FilterEdit_base( parent), current(0), mCategorySelectDialog( 0 ) { mFilters = filters; TQWhatsThis::add( mNewButton, i18n( "Press this button to define a new filter." ) ); diff --git a/korganizer/filtereditdialog.h b/korganizer/filtereditdialog.h index 76d3c724d..e278bded5 100644 --- a/korganizer/filtereditdialog.h +++ b/korganizer/filtereditdialog.h @@ -47,7 +47,7 @@ class FilterEditDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - FilterEditDialog(TQPtrList<CalFilter> *,TQWidget *tqparent=0, const char *name=0); + FilterEditDialog(TQPtrList<CalFilter> *,TQWidget *parent=0, const char *name=0); virtual ~FilterEditDialog(); signals: @@ -72,7 +72,7 @@ class FilterEdit : public FilterEdit_base Q_OBJECT TQ_OBJECT public: - FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *tqparent); + FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent); ~FilterEdit(); void updateFilterList(); diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index 7093b5f01..ec32367b1 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -123,8 +123,8 @@ void FreeBusyDownloadJob::slotResult( KIO::Job *job ) //// -FreeBusyManager::FreeBusyManager( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), +FreeBusyManager::FreeBusyManager( TQObject *parent, const char *name ) + : TQObject( parent, name ), mCalendar( 0 ), mTimerID( 0 ), mUploadingFreeBusy( false ), mBrokenUrl( false ) { diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h index 8babe454d..1cda25fa3 100644 --- a/korganizer/freebusymanager.h +++ b/korganizer/freebusymanager.h @@ -82,7 +82,7 @@ class FreeBusyManager : public TQObject, public KCal::FreeBusyCache Q_OBJECT TQ_OBJECT public: - FreeBusyManager( TQObject *tqparent, const char *name ); + FreeBusyManager( TQObject *parent, const char *name ); void setCalendar( KCal::Calendar * ); diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp index 15dece944..67f23d35e 100644 --- a/korganizer/freebusyurldialog.cpp +++ b/korganizer/freebusyurldialog.cpp @@ -35,9 +35,9 @@ #include <tqlayout.h> #include <tqlabel.h> -FreeBusyUrlDialog::FreeBusyUrlDialog( KCal::Attendee *attendee, TQWidget *tqparent, +FreeBusyUrlDialog::FreeBusyUrlDialog( KCal::Attendee *attendee, TQWidget *parent, const char *name ) - : KDialogBase( Plain, i18n("Edit Free/Busy Location"), Ok|Cancel, Ok, tqparent, + : KDialogBase( Plain, i18n("Edit Free/Busy Location"), Ok|Cancel, Ok, parent, name, true, false ) { TQFrame *topFrame = plainPage(); @@ -57,9 +57,9 @@ void FreeBusyUrlDialog::slotOk() } -FreeBusyUrlWidget::FreeBusyUrlWidget( KCal::Attendee *attendee, TQWidget *tqparent, +FreeBusyUrlWidget::FreeBusyUrlWidget( KCal::Attendee *attendee, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ), mAttendee( attendee ) + : TQWidget( parent, name ), mAttendee( attendee ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); diff --git a/korganizer/freebusyurldialog.h b/korganizer/freebusyurldialog.h index e3a6d5cba..e18728cde 100644 --- a/korganizer/freebusyurldialog.h +++ b/korganizer/freebusyurldialog.h @@ -38,7 +38,7 @@ class FreeBusyUrlDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - FreeBusyUrlDialog( KCal::Attendee *, TQWidget *tqparent = 0, + FreeBusyUrlDialog( KCal::Attendee *, TQWidget *parent = 0, const char *name = 0 ); public slots: @@ -53,7 +53,7 @@ class FreeBusyUrlWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - FreeBusyUrlWidget( KCal::Attendee *, TQWidget *tqparent = 0, + FreeBusyUrlWidget( KCal::Attendee *, TQWidget *parent = 0, const char *name = 0 ); ~FreeBusyUrlWidget(); diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp index aa93e34f8..4db3a069b 100644 --- a/korganizer/importdialog.cpp +++ b/korganizer/importdialog.cpp @@ -37,8 +37,8 @@ using namespace KCal; -ImportDialog::ImportDialog( const KURL &url, TQWidget *tqparent, bool isPart ) - : KDialogBase( Plain, i18n("Import Calendar/Event"), Ok | Cancel, Ok, tqparent, +ImportDialog::ImportDialog( const KURL &url, TQWidget *parent, bool isPart ) + : KDialogBase( Plain, i18n("Import Calendar/Event"), Ok | Cancel, Ok, parent, 0, true, true ), mUrl( url ) { diff --git a/korganizer/importdialog.h b/korganizer/importdialog.h index 1ee42a159..92726cd2e 100644 --- a/korganizer/importdialog.h +++ b/korganizer/importdialog.h @@ -37,7 +37,7 @@ class ImportDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ImportDialog( const KURL &url, TQWidget *tqparent, bool isPart ); + ImportDialog( const KURL &url, TQWidget *parent, bool isPart ); ~ImportDialog(); public slots: diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp index 8b922034a..0cf69fc20 100644 --- a/korganizer/incidencechanger.cpp +++ b/korganizer/incidencechanger.cpp @@ -55,7 +55,7 @@ bool IncidenceChanger::beginChange( Incidence *incidence, bool IncidenceChanger::sendGroupwareMessage( Incidence *incidence, KCal::Scheduler::Method method, KOGlobals::HowChanged action, - TQWidget *tqparent ) + TQWidget *parent ) { if ( KOPrefs::instance()->thatIsMe( incidence->organizer().email() ) && incidence->attendeeCount()>0 && !KOPrefs::instance()->mUseGroupwareCommunication ) { @@ -63,7 +63,7 @@ bool IncidenceChanger::sendGroupwareMessage( Incidence *incidence, return true; } else if( KOPrefs::instance()->mUseGroupwareCommunication ) { return - KOGroupware::instance()->sendICalMessage( tqparent, method, incidence, action, false ); + KOGroupware::instance()->sendICalMessage( parent, method, incidence, action, false ); } return true; } @@ -111,12 +111,12 @@ bool IncidenceChanger::endChange( Incidence *incidence, return calRes->endChange( incidence, res, subRes ); } -bool IncidenceChanger::deleteIncidence( Incidence *incidence, TQWidget *tqparent ) +bool IncidenceChanger::deleteIncidence( Incidence *incidence, TQWidget *parent ) { if ( !incidence ) return true; kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<<incidence->summary()<<"\""<<endl; bool doDelete = sendGroupwareMessage( incidence, KCal::Scheduler::Cancel, - KOGlobals::INCIDENCEDELETED, tqparent ); + KOGlobals::INCIDENCEDELETED, parent ); if( doDelete ) { // @TODO: let Calendar::deleteIncidence do the locking... Incidence* tmp = incidence->clone(); @@ -152,7 +152,7 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<<incidence-> } bool IncidenceChanger::cutIncidences( const Incidence::List &incidences, - TQWidget *tqparent ) + TQWidget *parent ) { Incidence::List::ConstIterator it; bool doDelete = true; @@ -160,7 +160,7 @@ bool IncidenceChanger::cutIncidences( const Incidence::List &incidences, for ( it = incidences.constBegin(); it != incidences.constEnd(); ++it ) { if ( *it ) { doDelete = sendGroupwareMessage( *it, KCal::Scheduler::Cancel, - KOGlobals::INCIDENCEDELETED, tqparent ); + KOGlobals::INCIDENCEDELETED, parent ); if ( doDelete ) { emit incidenceToBeDeleted( *it ); incsToCut.append( *it ); @@ -180,11 +180,11 @@ bool IncidenceChanger::cutIncidences( const Incidence::List &incidences, } } -bool IncidenceChanger::cutIncidence( Incidence *incidence, TQWidget *tqparent ) +bool IncidenceChanger::cutIncidence( Incidence *incidence, TQWidget *parent ) { Incidence::List incidences; incidences.append( incidence ); - return cutIncidences( incidences, tqparent ); + return cutIncidences( incidences, parent ); } class IncidenceChanger::ComparisonVisitor : public IncidenceBase::Visitor @@ -327,14 +327,14 @@ bool IncidenceChanger::myAttendeeStatusChanged( Incidence *oldInc, Incidence *ne bool IncidenceChanger::changeIncidence( Incidence *oldinc, Incidence *newinc, KOGlobals::WhatChanged action, - TQWidget *tqparent ) + TQWidget *parent ) { - return changeIncidence( oldinc, newinc, action, tqparent, 0 ); + return changeIncidence( oldinc, newinc, action, parent, 0 ); } bool IncidenceChanger::changeIncidence( Incidence *oldinc, Incidence *newinc, KOGlobals::WhatChanged action, - TQWidget *tqparent, + TQWidget *parent, int dontAskForGroupware ) { kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<<newinc->summary()<<"\" ( old one was \""<<oldinc->summary()<<"\")"<<endl; @@ -353,7 +353,7 @@ kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<<newinc->sum bool success = true; if ( KOPrefs::instance()->mUseGroupwareCommunication ) { success = KOGroupware::instance()->sendICalMessage( - tqparent, + parent, KCal::Scheduler::Request, newinc, KOGlobals::INCIDENCEEDITED, attendeeStatusChanged, dontAskForGroupware ); } @@ -372,19 +372,19 @@ kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<<newinc->sum bool IncidenceChanger::addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *tqparent ) + TQWidget *parent ) { - return addIncidence( incidence, res, subRes, tqparent, 0 ); + return addIncidence( incidence, res, subRes, parent, 0 ); } bool IncidenceChanger::addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *tqparent, int dontAskForGroupware ) + TQWidget *parent, int dontAskForGroupware ) { CalendarResources *stdcal = dynamic_cast<CalendarResources *>( mCalendar ); if( stdcal && !stdcal->hasCalendarResources() ) { KMessageBox::sorry( - tqparent, + parent, i18n( "No calendars found, unable to save %1 \"%2\"." ). arg( i18n( incidence->type() ) ). arg( incidence->summary() ) ); @@ -392,14 +392,14 @@ bool IncidenceChanger::addIncidence( Incidence *incidence, return false; } - // FIXME: This is a nasty hack, since we need to set a tqparent for the + // FIXME: This is a nasty hack, since we need to set a parent for the // resource selection dialog. However, we don't have any UI methods // in the calendar, only in the CalendarResources::DestinationPolicy // So we need to type-cast it and extract it from the CalendarResources - TQWidget *tmptqparent = 0; + TQWidget *tmpparent = 0; if ( stdcal ) { - tmptqparent = stdcal->dialogParentWidget(); - stdcal->setDialogParentWidget( tqparent ); + tmpparent = stdcal->dialogParentWidget(); + stdcal->setDialogParentWidget( parent ); } // If a ResourceCalendar isn't provided, then try to compute one @@ -445,7 +445,7 @@ bool IncidenceChanger::addIncidence( Incidence *incidence, arg( incidence->summary() ). arg( pResName ); } - KMessageBox::sorry( tqparent, errMessage ); + KMessageBox::sorry( parent, errMessage ); } kdDebug(5850) << "IncidenceChanger: Can't add incidence" << endl; return false; @@ -453,11 +453,11 @@ bool IncidenceChanger::addIncidence( Incidence *incidence, if ( KOPrefs::instance()->mUseGroupwareCommunication ) { if ( !KOGroupware::instance()->sendICalMessage( - tqparent, + parent, KCal::Scheduler::Request, incidence, KOGlobals::INCIDENCEADDED, false, dontAskForGroupware ) ) { KMessageBox::sorry( - tqparent, + parent, i18n( "Attempt to send the scheduling message failed. " "Please check your Group Scheduling settings. " "Contact your system administrator for more help.") ); diff --git a/korganizer/incidencechanger.h b/korganizer/incidencechanger.h index 09a2bda61..bfbac8512 100644 --- a/korganizer/incidencechanger.h +++ b/korganizer/incidencechanger.h @@ -35,8 +35,8 @@ class IncidenceChanger : public KOrg::IncidenceChangerBase Q_OBJECT TQ_OBJECT public: - IncidenceChanger( Calendar *cal, TQObject *tqparent ) - : IncidenceChangerBase( cal, tqparent ) {} + IncidenceChanger( Calendar *cal, TQObject *parent ) + : IncidenceChangerBase( cal, parent ) {} ~IncidenceChanger() {} bool beginChange( Incidence *incidence, @@ -45,27 +45,27 @@ class IncidenceChanger : public KOrg::IncidenceChangerBase bool sendGroupwareMessage( Incidence *incidence, KCal::Scheduler::Method method, KOGlobals::HowChanged action, - TQWidget *tqparent ); + TQWidget *parent ); bool endChange( Incidence *incidence, ResourceCalendar *res, const TQString &subRes ); bool addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *tqparent ); + TQWidget *parent ); bool addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *tqparent, int dontAskForGroupware ); + TQWidget *parent, int dontAskForGroupware ); bool changeIncidence( Incidence *oldinc, Incidence *newinc, - KOGlobals::WhatChanged, TQWidget *tqparent ); + KOGlobals::WhatChanged, TQWidget *parent ); bool changeIncidence( Incidence *oldinc, Incidence *newinc, - KOGlobals::WhatChanged, TQWidget *tqparent, int dontAskForGroupware ); + KOGlobals::WhatChanged, TQWidget *parent, int dontAskForGroupware ); - bool deleteIncidence( Incidence *incidence, TQWidget *tqparent ); + bool deleteIncidence( Incidence *incidence, TQWidget *parent ); - bool cutIncidences( const Incidence::List &incidences, TQWidget *tqparent ); - bool cutIncidence( Incidence *incidence, TQWidget *tqparent ); + bool cutIncidences( const Incidence::List &incidences, TQWidget *parent ); + bool cutIncidence( Incidence *incidence, TQWidget *parent ); static bool incidencesEqual( Incidence *inc1, Incidence *inc2 ); static bool assignIncidence( Incidence *inc1, Incidence *inc2 ); diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index 31a3edbc0..f14ecf490 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h @@ -66,11 +66,11 @@ class KDE_EXPORT BaseView : public TQWidget @param cal Pointer to the calendar object from which events will be retrieved for display. - @param tqparent tqparent widget. + @param parent parent widget. @param name name of this widget. */ - BaseView( Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 ) - : TQWidget( tqparent, name ), + BaseView( Calendar *cal, TQWidget *parent = 0, const char *name = 0 ) + : TQWidget( parent, name ), mReadOnly( false ), mCalendar( cal ), mResource( 0 ), mChanger( 0 ) {} /** diff --git a/korganizer/interfaces/korganizer/calendarviewbase.h b/korganizer/interfaces/korganizer/calendarviewbase.h index 8afefdd84..f6f39f065 100644 --- a/korganizer/interfaces/korganizer/calendarviewbase.h +++ b/korganizer/interfaces/korganizer/calendarviewbase.h @@ -37,8 +37,8 @@ namespace KOrg { class CalendarViewBase : public TQWidget { public: - CalendarViewBase( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) {} + CalendarViewBase( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) {} virtual ~CalendarViewBase() {} virtual KCal::Calendar *calendar() = 0; diff --git a/korganizer/interfaces/korganizer/incidencechangerbase.h b/korganizer/interfaces/korganizer/incidencechangerbase.h index ba4faf065..169ea1b25 100644 --- a/korganizer/interfaces/korganizer/incidencechangerbase.h +++ b/korganizer/interfaces/korganizer/incidencechangerbase.h @@ -41,14 +41,14 @@ class IncidenceChangerBase : public TQObject Q_OBJECT TQ_OBJECT public: - IncidenceChangerBase( Calendar*cal, TQObject *tqparent = 0 ) : - TQObject( tqparent ), mCalendar( cal ) {} + IncidenceChangerBase( Calendar*cal, TQObject *parent = 0 ) : + TQObject( parent ), mCalendar( cal ) {} virtual ~IncidenceChangerBase() {} virtual bool sendGroupwareMessage( Incidence *incidence, KCal::Scheduler::Method method, KOGlobals::HowChanged action, - TQWidget *tqparent ) = 0; + TQWidget *parent ) = 0; virtual bool beginChange( Incidence *incidence, ResourceCalendar *res, const TQString &subRes ) = 0; @@ -57,20 +57,20 @@ public: virtual bool addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *tqparent ) = 0; + TQWidget *parent ) = 0; virtual bool addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *tqparent, int dontAskForGroupware) = 0; + TQWidget *parent, int dontAskForGroupware) = 0; virtual bool changeIncidence( Incidence *oldinc, Incidence *newinc, - KOGlobals::WhatChanged, TQWidget *tqparent ) = 0; + KOGlobals::WhatChanged, TQWidget *parent ) = 0; virtual bool changeIncidence( Incidence *oldinc, Incidence *newinc, - KOGlobals::WhatChanged, TQWidget *tqparent, int dontAskForGroupware ) = 0; + KOGlobals::WhatChanged, TQWidget *parent, int dontAskForGroupware ) = 0; - virtual bool deleteIncidence( Incidence *incidence, TQWidget *tqparent ) = 0; + virtual bool deleteIncidence( Incidence *incidence, TQWidget *parent ) = 0; - virtual bool cutIncidences( const Incidence::List &incidences, TQWidget *tqparent ) = 0; - virtual bool cutIncidence( Incidence *incidence, TQWidget *tqparent ) = 0; + virtual bool cutIncidences( const Incidence::List &incidences, TQWidget *parent ) = 0; + virtual bool cutIncidence( Incidence *incidence, TQWidget *parent ) = 0; signals: void incidenceAdded( Incidence * ); diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h index 38763c3af..50c765d65 100644 --- a/korganizer/interfaces/korganizer/part.h +++ b/korganizer/interfaces/korganizer/part.h @@ -38,8 +38,8 @@ class Part : public KParts::Part typedef TQPtrList<Part> List; - Part( MainWindow *tqparent, const char *name ) - : KParts::Part( tqparent?(TQT_TQOBJECT(tqparent->tqtopLevelWidget())):0, name ), mMainWindow( tqparent ) {} + Part( MainWindow *parent, const char *name ) + : KParts::Part( parent?(TQT_TQOBJECT(parent->tqtopLevelWidget())):0, name ), mMainWindow( parent ) {} virtual ~Part() {} @@ -56,7 +56,7 @@ class Part : public KParts::Part class PartFactory : public KLibFactory { public: - virtual Part *create( MainWindow *tqparent, const char *name = 0 ) = 0; + virtual Part *create( MainWindow *parent, const char *name = 0 ) = 0; protected: virtual TQObject *createObject( TQObject *, const char *,const char *, diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index bff67c764..cf93a58f1 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -60,16 +60,16 @@ class JournalTitleLable : public KActiveLabel { public: - JournalTitleLable( TQWidget *tqparent, const char *name=0 ) : KActiveLabel( tqparent, name ) {} + JournalTitleLable( TQWidget *parent, const char *name=0 ) : KActiveLabel( parent, name ) {} void openLink( const TQString &/*link*/ ) {} }; -JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *tqparent ) : - TQVBox( tqparent ), mCalendar( calendar ) +JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) : + TQVBox( parent ), mCalendar( calendar ) { -//kdDebug(5850)<<"JournalEntry::JournalEntry, tqparent="<<tqparent<<endl; +//kdDebug(5850)<<"JournalEntry::JournalEntry, parent="<<parent<<endl; mChanger = 0; mTitle = new JournalTitleLable( this ); @@ -175,10 +175,10 @@ void JournalDateEntry::journalDeleted( Journal *journal ) -JournalEntry::JournalEntry( Journal* j, TQWidget *tqparent ) : - TQWidget( tqparent ), mJournal( j ) +JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : + TQWidget( parent ), mJournal( j ) { -//kdDebug(5850)<<"JournalEntry::JournalEntry, tqparent="<<tqparent<<endl; +//kdDebug(5850)<<"JournalEntry::JournalEntry, parent="<<parent<<endl; mDirty = false; mWriteInProgress = false; mChanger = 0; diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h index 3ea74f3d9..496cb395a 100644 --- a/korganizer/journalentry.h +++ b/korganizer/journalentry.h @@ -53,7 +53,7 @@ class JournalEntry : public TQWidget { public: typedef ListBase<JournalEntry> List; - JournalEntry( Journal* j, TQWidget *tqparent ); + JournalEntry( Journal* j, TQWidget *parent ); virtual ~JournalEntry(); void setJournal(Journal *); @@ -118,7 +118,7 @@ class JournalDateEntry : public TQVBox { public: typedef ListBase<JournalDateEntry> List; - JournalDateEntry( Calendar *, TQWidget *tqparent ); + JournalDateEntry( Calendar *, TQWidget *parent ); virtual ~JournalDateEntry(); void addJournal( Journal * ); diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 9ee1f20c0..d47b79748 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -45,8 +45,8 @@ #include "kdatenavigator.h" -KDateNavigator::KDateNavigator( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name ), mBaseDate( 1970, 1, 1 ) +KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) + : TQFrame( parent, name ), mBaseDate( 1970, 1, 1 ) { TQGridLayout* topLayout = new TQGridLayout( this, 8, 8 ); diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h index 98bf81d72..b36de3048 100644 --- a/korganizer/kdatenavigator.h +++ b/korganizer/kdatenavigator.h @@ -47,7 +47,7 @@ class KDateNavigator: public TQFrame Q_OBJECT TQ_OBJECT public: - KDateNavigator( TQWidget *tqparent = 0, const char *name = 0 ); + KDateNavigator( TQWidget *parent = 0, const char *name = 0 ); ~KDateNavigator(); /** diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index f9a1236e7..5600682f1 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -172,8 +172,8 @@ void MarcusBains::updateLocationRecalc( bool recalculate ) Create an agenda widget with rows rows and columns columns. */ KOAgenda::KOAgenda( int columns, int rows, int rowSize, CalendarView *calendarView, - TQWidget *tqparent, const char *name, WFlags f ) - : TQScrollView( tqparent, name, f ), mChanger( 0 ) + TQWidget *parent, const char *name, WFlags f ) + : TQScrollView( parent, name, f ), mChanger( 0 ) { mColumns = columns; mRows = rows; @@ -195,8 +195,8 @@ KOAgenda::KOAgenda( int columns, int rows, int rowSize, CalendarView *calendarVi Create an agenda widget with columns columns and one row. This is used for all-day events. */ -KOAgenda::KOAgenda( int columns, CalendarView *calendarView, TQWidget *tqparent, - const char *name, WFlags f ) : TQScrollView( tqparent, name, f ) +KOAgenda::KOAgenda( int columns, CalendarView *calendarView, TQWidget *parent, + const char *name, WFlags f ) : TQScrollView( parent, name, f ) { mColumns = columns; mRows = 1; @@ -1419,7 +1419,7 @@ void KOAgenda::drawContents(TQPainter* p, int cx, int cy, int cw, int ch) } } } else { - // last entry in holiday tqmask denotes the previous day not visible (needed for overnight shifts) + // last entry in holiday mask denotes the previous day not visible (needed for overnight shifts) if ( gxStart < int(mHolidayMask->count()-1) && !mHolidayMask->at(gxStart)) { dbp.fillRect( xStart, pt1.y(), xWidth, pt2.y() - pt1.y() + 1, KOPrefs::instance()->mWorkingHoursColor ); @@ -2038,9 +2038,9 @@ void KOAgenda::setDateList(const DateList &selectedDates) marcus_bains(); } -void KOAgenda::setHolidayMask(TQMemArray<bool> *tqmask) +void KOAgenda::setHolidayMask(TQMemArray<bool> *mask) { - mHolidayMask = tqmask; + mHolidayMask = mask; } diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h index 2dfb45517..9bc7b00d5 100644 --- a/korganizer/koagenda.h +++ b/korganizer/koagenda.h @@ -77,9 +77,9 @@ class KOAgenda : public TQScrollView TQ_OBJECT public: KOAgenda ( int columns, int rows, int columnSize, CalendarView *calendarView, - TQWidget *tqparent=0, const char *name = 0, WFlags f = 0 ); + TQWidget *parent=0, const char *name = 0, WFlags f = 0 ); - KOAgenda ( int columns, CalendarView *calendarView, TQWidget *tqparent = 0, + KOAgenda ( int columns, CalendarView *calendarView, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~KOAgenda(); diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 86dc54a72..d0dd46048 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -64,10 +64,10 @@ TQPixmap *KOAgendaItem::organizerPxmp = 0; //-------------------------------------------------------------------------- KOAgendaItem::KOAgendaItem( Calendar *calendar, Incidence *incidence, - const TQDate &qd, TQWidget *tqparent, + const TQDate &qd, TQWidget *parent, int itemPos, int itemCount, const char *name, WFlags f ) : - TQWidget( tqparent, name, f ), mCalendar( calendar ), mIncidence( incidence ), mDate( qd ), + TQWidget( parent, name, f ), mCalendar( calendar ), mIncidence( incidence ), mDate( qd ), mLabelText( mIncidence->summary() ), mIconAlarm( false ), mIconRecur( false ), mIconReadonly( false ), mIconReply( false ), mIconGroup( false ), mIconGroupTentative( false ), mIconOrganizer( false ), diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h index fa4b7c432..23a36acf9 100644 --- a/korganizer/koagendaitem.h +++ b/korganizer/koagendaitem.h @@ -78,7 +78,7 @@ class KOAgendaItem : public TQWidget, public KOrg::CellItem TQ_OBJECT public: KOAgendaItem( Calendar *calendar, Incidence *incidence, const TQDate &qd, - TQWidget *tqparent, + TQWidget *parent, int itemPos, int itemCount, const char *name = 0, WFlags f = 0 ); diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index ef884b848..ba565a8d2 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -76,8 +76,8 @@ using namespace KOrg; -EventIndicator::EventIndicator(Location loc,TQWidget *tqparent,const char *name) - : TQFrame(tqparent,name) +EventIndicator::EventIndicator(Location loc,TQWidget *parent,const char *name) + : TQFrame(parent,name) { mColumns = 1; mEnabled.resize( mColumns ); @@ -133,8 +133,8 @@ void EventIndicator::enableColumn(int column, bool enable) KOAlternateLabel::KOAlternateLabel(const TQString &shortlabel, const TQString &longlabel, - const TQString &extensivelabel, TQWidget *tqparent, const char *name ) - : TQLabel(tqparent, name), mTextTypeFixed(false), mShortText(shortlabel), + const TQString &extensivelabel, TQWidget *parent, const char *name ) + : TQLabel(parent, name), mTextTypeFixed(false), mShortText(shortlabel), mLongText(longlabel), mExtensiveText(extensivelabel) { tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); @@ -248,10 +248,10 @@ TQSize KOAlternateLabel::tqminimumSizeHint() const KOAgendaView::KOAgendaView( Calendar *cal, CalendarView *calendarView, - TQWidget *tqparent, + TQWidget *parent, const char *name, bool isSideBySide ) : - KOrg::AgendaView (cal, tqparent,name), mExpandButton( 0 ), + KOrg::AgendaView (cal, parent,name), mExpandButton( 0 ), mAllowAgendaUpdate( true ), mUpdateItem( 0 ), mIsSideBySide( isSideBySide ), @@ -1639,7 +1639,7 @@ void KOAgendaView::setHolidayMasks() } // Store the information about the day before the visible area (needed for - // overnight working hours) in the last bit of the tqmask: + // overnight working hours) in the last bit of the mask: bool showDay = !KOGlobals::self()->isWorkDay( mSelectedDates[ 0 ].addDays( -1 ) ); mHolidayMask[ mSelectedDates.count() ] = showDay; diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index 3b0e51b56..647dcafcb 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h @@ -54,7 +54,7 @@ class EventIndicator : public TQFrame TQ_OBJECT public: enum Location { Top, Bottom }; - EventIndicator( Location loc = Top, TQWidget *tqparent = 0, + EventIndicator( Location loc = Top, TQWidget *parent = 0, const char *name = 0 ); virtual ~EventIndicator(); @@ -79,7 +79,7 @@ class KOAlternateLabel : public TQLabel public: KOAlternateLabel( const TQString &shortlabel, const TQString &longlabel, const TQString &extensivelabel = TQString(), - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~KOAlternateLabel(); virtual TQSize tqminimumSizeHint() const; @@ -112,7 +112,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer public: KOAgendaView( Calendar *cal, CalendarView *calendarView, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0, bool isSideBySide = false ); virtual ~KOAgendaView(); diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 15493ef9a..bc759df04 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -55,15 +55,15 @@ using namespace KCal; -KOAttendeeEditor::KOAttendeeEditor( TQWidget * tqparent, const char *name ) : - TQWidget( tqparent, name ), +KOAttendeeEditor::KOAttendeeEditor( TQWidget * parent, const char *name ) : + TQWidget( parent, name ), mDisableItemUpdate( true ) { } -void KOAttendeeEditor::initOrganizerWidgets(TQWidget * tqparent, TQBoxLayout * tqlayout) +void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tqlayout) { - mOrganizerHBox = new TQHBox( tqparent ); + mOrganizerHBox = new TQHBox( parent ); tqlayout->addWidget( mOrganizerHBox ); // If creating a new event, then the user is the organizer -> show the // identity combo @@ -91,7 +91,7 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * tqparent, TQBoxLayout * t mOrganizerHBox->setStretchFactor( mOrganizerCombo, 100 ); } -void KOAttendeeEditor::initEditWidgets(TQWidget * tqparent, TQBoxLayout * tqlayout) +void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout) { TQGridLayout *topLayout = new TQGridLayout(); tqlayout->addLayout( topLayout ); @@ -99,12 +99,12 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * tqparent, TQBoxLayout * tqlayo TQString whatsThis = i18n("Edits the name of the attendee selected in the list " "above, or adds a new attendee if there are no attendees" "in the list."); - TQLabel *attendeeLabel = new TQLabel( tqparent ); + TQLabel *attendeeLabel = new TQLabel( parent ); TQWhatsThis::add( attendeeLabel, whatsThis ); attendeeLabel->setText( i18n("Na&me:") ); topLayout->addWidget( attendeeLabel, 0, 0 ); - mNameEdit = new KPIM::AddresseeLineEdit( tqparent ); + mNameEdit = new KPIM::AddresseeLineEdit( parent ); TQWhatsThis::add( mNameEdit, whatsThis ); mNameEdit->setClickMessage( i18n("Click to add a new attendee") ); attendeeLabel->setBuddy( mNameEdit ); @@ -116,12 +116,12 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * tqparent, TQBoxLayout * tqlayo whatsThis = i18n("Edits the role of the attendee selected " "in the list above."); - TQLabel *attendeeRoleLabel = new TQLabel( tqparent ); + TQLabel *attendeeRoleLabel = new TQLabel( parent ); TQWhatsThis::add( attendeeRoleLabel, whatsThis ); attendeeRoleLabel->setText( i18n("Ro&le:") ); topLayout->addWidget( attendeeRoleLabel, 1, 0 ); - mRoleCombo = new TQComboBox( false, tqparent ); + mRoleCombo = new TQComboBox( false, parent ); TQWhatsThis::add( mRoleCombo, whatsThis ); mRoleCombo->insertStringList( Attendee::roleList() ); attendeeRoleLabel->setBuddy( mRoleCombo ); @@ -129,17 +129,17 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * tqparent, TQBoxLayout * tqlayo TQT_SLOT( updateAttendee() ) ); topLayout->addWidget( mRoleCombo, 1, 1 ); - mDelegateLabel = new TQLabel( tqparent ); + mDelegateLabel = new TQLabel( parent ); topLayout->addWidget( mDelegateLabel, 1, 2 ); whatsThis = i18n("Edits the current attendance status of the attendee " "selected in the list above."); - TQLabel *statusLabel = new TQLabel( tqparent ); + TQLabel *statusLabel = new TQLabel( parent ); TQWhatsThis::add( statusLabel, whatsThis ); statusLabel->setText( i18n("Stat&us:") ); topLayout->addWidget( statusLabel, 2, 0 ); - mStatusCombo = new TQComboBox( false, tqparent ); + mStatusCombo = new TQComboBox( false, parent ); TQWhatsThis::add( mStatusCombo, whatsThis ); // mStatusCombo->insertStringList( Attendee::statusList() ); mStatusCombo->insertItem( SmallIcon( "help" ), Attendee::statusName( Attendee::NeedsAction ) ); @@ -157,7 +157,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * tqparent, TQBoxLayout * tqlayo topLayout->setColStretch( 2, 1 ); - mRsvpButton = new TQCheckBox( tqparent ); + mRsvpButton = new TQCheckBox( parent ); TQWhatsThis::add( mRsvpButton, i18n("Edits whether to send an email to the attendee " "selected in the list above to request " @@ -166,7 +166,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * tqparent, TQBoxLayout * tqlayo connect( mRsvpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAttendee() ) ); topLayout->addWidget( mRsvpButton, 2, 2 ); - TQWidget *buttonBox = new TQWidget( tqparent ); + TQWidget *buttonBox = new TQWidget( parent ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( buttonBox ); mAddButton = new TQPushButton( i18n("&New"), buttonBox ); diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h index 85c15e8e2..828bf479e 100644 --- a/korganizer/koattendeeeditor.h +++ b/korganizer/koattendeeeditor.h @@ -49,7 +49,7 @@ class KOAttendeeEditor : public TQWidget Q_OBJECT TQ_OBJECT public: - KOAttendeeEditor( TQWidget *tqparent, const char *name = 0 ); + KOAttendeeEditor( TQWidget *parent, const char *name = 0 ); virtual void insertAttendee( KCal::Attendee *attendee, bool fetchFB = true ) = 0; virtual void removeAttendee( KCal::Attendee *attendee ) = 0; @@ -68,8 +68,8 @@ class KOAttendeeEditor : public TQWidget void updateAttendeeSummary( int count ); protected: - void initOrganizerWidgets( TQWidget *tqparent, TQBoxLayout *tqlayout ); - void initEditWidgets( TQWidget *tqparent, TQBoxLayout *tqlayout ); + void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *tqlayout ); + void initEditWidgets( TQWidget *parent, TQBoxLayout *tqlayout ); /** Reads values from a KABC::Addressee and inserts a new Attendee * item into the listview with those items. Used when adding attendees diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp index ce5d0c257..b3781e2d9 100644 --- a/korganizer/kocore.cpp +++ b/korganizer/kocore.cpp @@ -170,7 +170,7 @@ KOrg::CalendarDecoration *KOCore::loadCalendarDecoration( const TQString &name ) return 0; } -KOrg::Part *KOCore::loadPart( KService::Ptr service, KOrg::MainWindow *tqparent ) +KOrg::Part *KOCore::loadPart( KService::Ptr service, KOrg::MainWindow *parent ) { kdDebug(5850) << "loadPart: library: " << service->library() << endl; @@ -194,7 +194,7 @@ KOrg::Part *KOCore::loadPart( KService::Ptr service, KOrg::MainWindow *tqparent return 0; } - return pluginFactory->create( tqparent ); + return pluginFactory->create( parent ); } KOrg::PrintPlugin *KOCore::loadPrintPlugin( KService::Ptr service ) @@ -244,13 +244,13 @@ KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const return 0; } -KOrg::Part *KOCore::loadPart( const TQString &name, KOrg::MainWindow *tqparent ) +KOrg::Part *KOCore::loadPart( const TQString &name, KOrg::MainWindow *parent ) { KTrader::OfferList list = availableParts(); KTrader::OfferList::ConstIterator it; for( it = list.begin(); it != list.end(); ++it ) { if ( (*it)->desktopEntryName() == name ) { - return loadPart( *it, tqparent ); + return loadPart( *it, parent ); } } return 0; @@ -291,7 +291,7 @@ KOrg::CalendarDecoration::List KOCore::calendarDecorations() return mCalendarDecorations; } -KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *tqparent ) +KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *parent ) { KOrg::Part::List parts; @@ -302,13 +302,13 @@ KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *tqparent ) for( it = plugins.begin(); it != plugins.end(); ++it ) { if ( selectedPlugins.find( (*it)->desktopEntryName() ) != selectedPlugins.end() ) { - KOrg::Part *part = loadPart( *it, tqparent ); + KOrg::Part *part = loadPart( *it, parent ); if ( part ) { - if ( !tqparent->mainGuiClient() ) { - kdError() << "KOCore::loadParts(): tqparent has no mainGuiClient." + if ( !parent->mainGuiClient() ) { + kdError() << "KOCore::loadParts(): parent has no mainGuiClient." << endl; } else { - tqparent->mainGuiClient()->insertChildClient( part ); + parent->mainGuiClient()->insertChildClient( part ); parts.append( part ); } } @@ -346,26 +346,26 @@ void KOCore::unloadPlugins() mCalendarDecorationsLoaded = false; } -void KOCore::unloadParts( KOrg::MainWindow *tqparent, KOrg::Part::List &parts ) +void KOCore::unloadParts( KOrg::MainWindow *parent, KOrg::Part::List &parts ) { KOrg::Part *part; for( part = parts.first(); part; part = parts.next() ) { - tqparent->mainGuiClient()->removeChildClient( part ); + parent->mainGuiClient()->removeChildClient( part ); delete part; } parts.clear(); } -KOrg::Part::List KOCore::reloadParts( KOrg::MainWindow *tqparent, +KOrg::Part::List KOCore::reloadParts( KOrg::MainWindow *parent, KOrg::Part::List &parts ) { - KXMLGUIFactory *factory = tqparent->mainGuiClient()->factory(); - factory->removeClient( tqparent->mainGuiClient() ); + KXMLGUIFactory *factory = parent->mainGuiClient()->factory(); + factory->removeClient( parent->mainGuiClient() ); - unloadParts( tqparent, parts ); - KOrg::Part::List list = loadParts( tqparent ); + unloadParts( parent, parts ); + KOrg::Part::List list = loadParts( parent ); - factory->addClient( tqparent->mainGuiClient() ); + factory->addClient( parent->mainGuiClient() ); return list; } diff --git a/korganizer/kocore.h b/korganizer/kocore.h index 9feaaf0a0..3b1a756fc 100644 --- a/korganizer/kocore.h +++ b/korganizer/kocore.h @@ -52,15 +52,15 @@ class KDE_EXPORT KOCore KOrg::CalendarDecoration *loadCalendarDecoration( KService::Ptr service ); KOrg::CalendarDecoration *loadCalendarDecoration( const TQString & ); - KOrg::Part *loadPart( KService::Ptr, KOrg::MainWindow *tqparent ); - KOrg::Part *loadPart( const TQString &, KOrg::MainWindow *tqparent ); + KOrg::Part *loadPart( KService::Ptr, KOrg::MainWindow *parent ); + KOrg::Part *loadPart( const TQString &, KOrg::MainWindow *parent ); KOrg::PrintPlugin *loadPrintPlugin( KService::Ptr service ); KOrg::PrintPlugin *loadPrintPlugin( const TQString & ); KOrg::CalendarDecoration::List calendarDecorations(); KOrg::PrintPlugin::List loadPrintPlugins(); - KOrg::Part::List loadParts( KOrg::MainWindow *tqparent ); + KOrg::Part::List loadParts( KOrg::MainWindow *parent ); void addXMLGUIClient( TQWidget*, KXMLGUIClient *guiclient ); void removeXMLGUIClient( TQWidget* ); @@ -70,7 +70,7 @@ class KDE_EXPORT KOCore Unload the parts in &p parts for this main window. Clears parts. */ - void unloadParts( KOrg::MainWindow *tqparent, KOrg::Part::List &parts ); + void unloadParts( KOrg::MainWindow *parent, KOrg::Part::List &parts ); void unloadPlugins(); void reloadPlugins(); @@ -79,7 +79,7 @@ class KDE_EXPORT KOCore Unloads the parts from the main window. Loads the parts that are listed in KOPrefs and returns a list of these parts. */ - KOrg::Part::List reloadParts( KOrg::MainWindow *tqparent, + KOrg::Part::List reloadParts( KOrg::MainWindow *parent, KOrg::Part::List &parts ); KPIM::IdentityManager* identityManager(); diff --git a/korganizer/kocounterdialog.cpp b/korganizer/kocounterdialog.cpp index 1490b8048..883aba872 100644 --- a/korganizer/kocounterdialog.cpp +++ b/korganizer/kocounterdialog.cpp @@ -32,8 +32,8 @@ #include "kocounterdialog.h" #include "kocounterdialog.moc" -KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, false, i18n("Counter-Event Viewer"), +KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, false, i18n("Counter-Event Viewer"), User1 | User2, User1, false, i18n("Decline"), i18n("Accept") ) { mEventViewer = new KOEventViewer( calendar, this ); diff --git a/korganizer/kocounterdialog.h b/korganizer/kocounterdialog.h index c18f9153c..14a454331 100644 --- a/korganizer/kocounterdialog.h +++ b/korganizer/kocounterdialog.h @@ -41,7 +41,7 @@ class KOCounterDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KOCounterDialog(Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0 ); + KOCounterDialog(Calendar *calendar, TQWidget *parent = 0, const char *name = 0 ); virtual ~KOCounterDialog(); void setIncidence( Incidence *incidence ); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 89e869164..0e921e440 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -64,10 +64,10 @@ // D Y N A M I C T I P // ============================================================================ -DynamicTip::DynamicTip( TQWidget * tqparent ) - : TQToolTip( tqparent ) +DynamicTip::DynamicTip( TQWidget * parent ) + : TQToolTip( parent ) { - mMatrix = static_cast<KODayMatrix *>( tqparent ); + mMatrix = static_cast<KODayMatrix *>( parent ); } @@ -99,8 +99,8 @@ void DynamicTip::maybeTip( const TQPoint &pos ) const int KODayMatrix::NOSELECTION = -1000; const int KODayMatrix::NUMDAYS = 42; -KODayMatrix::KODayMatrix( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name ), mCalendar( 0 ), mStartDate(), mPendingChanges( false ) +KODayMatrix::KODayMatrix( TQWidget *parent, const char *name ) + : TQFrame( parent, name ), mCalendar( 0 ), mStartDate(), mPendingChanges( false ) { // initialize dynamic arrays mDays = new TQDate[ NUMDAYS ]; diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index 443ecc0e4..37a48ebd2 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -57,11 +57,11 @@ class DynamicTip : public TQToolTip { public: /** - * Constructor that expects a KODayMatrix object as tqparent. + * Constructor that expects a KODayMatrix object as parent. * - * @param tqparent the tqparent KODayMatrix control. + * @param parent the parent KODayMatrix control. */ - DynamicTip( TQWidget *tqparent ); + DynamicTip( TQWidget *parent ); protected: /** @@ -73,7 +73,7 @@ class DynamicTip : public TQToolTip void maybeTip( const TQPoint &pos ); private: - /** the tqparent control this tooltip is designed for. */ + /** the parent control this tooltip is designed for. */ KODayMatrix *mMatrix; }; @@ -109,11 +109,11 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer public: /** constructor to create a day matrix widget. * - * @param tqparent widget that is the tqparent of the day matrix. + * @param parent widget that is the parent of the day matrix. * Normally this should be a KDateNavigator * @param name name of the widget */ - KODayMatrix( TQWidget *tqparent, const char *name ); + KODayMatrix( TQWidget *parent, const char *name ); /** destructor that deallocates all dynamically allocated private members. */ diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 296bde57f..9ceb1979e 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -90,7 +90,7 @@ KODialogManager::KODialogManager( CalendarView *mainView ) : mFilterEditDialog = 0; mCategoryEditDialog = new KPIM::CategoryEditDialog( KOPrefs::instance(), mMainView ); - // don't set any specific tqparent for the dialog, as its kept around and reused + // don't set any specific parent for the dialog, as its kept around and reused // in different cases where it should have different parents KWin::setMainWindow( mCategoryEditDialog, 0 ); connect( mainView, TQT_SIGNAL( categoriesChanged() ), @@ -108,9 +108,9 @@ KODialogManager::~KODialogManager() delete mFilterEditDialog; } -void KODialogManager::errorSaveIncidence( TQWidget *tqparent, Incidence *incidence ) +void KODialogManager::errorSaveIncidence( TQWidget *parent, Incidence *incidence ) { - KMessageBox::sorry( tqparent, i18n("Unable to save %1 \"%2\".") + KMessageBox::sorry( parent, i18n("Unable to save %1 \"%2\".") .tqarg( i18n( incidence->type() ) ) .tqarg( incidence->summary() ) ); } diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h index b078e01d4..1434e8da5 100644 --- a/korganizer/kodialogmanager.h +++ b/korganizer/kodialogmanager.h @@ -70,7 +70,7 @@ class KODialogManager : public TQObject void connectTypeAhead( KOEventEditor *editor, KOrg::AgendaView *agenda ); - static void errorSaveIncidence( TQWidget *tqparent, Incidence *incidence ); + static void errorSaveIncidence( TQWidget *parent, Incidence *incidence ); public slots: void showOptionsDialog(); diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp index 8c4168516..4211e93a9 100644 --- a/korganizer/koeditoralarms.cpp +++ b/korganizer/koeditoralarms.cpp @@ -54,7 +54,7 @@ class AlarmListViewItem : public TQListViewItem { public: - AlarmListViewItem( TQListView *tqparent, KCal::Alarm *alarm, const TQCString &inctype ); + AlarmListViewItem( TQListView *parent, KCal::Alarm *alarm, const TQCString &inctype ); virtual ~AlarmListViewItem(); KCal::Alarm *alarm() const { return mAlarm; } void construct(); @@ -67,9 +67,9 @@ class AlarmListViewItem : public TQListViewItem TQCString mIncType; }; -AlarmListViewItem::AlarmListViewItem( TQListView *tqparent, KCal::Alarm *alarm, +AlarmListViewItem::AlarmListViewItem( TQListView *parent, KCal::Alarm *alarm, const TQCString &inctype ) - : TQListViewItem( tqparent ), mIncType( inctype ) + : TQListViewItem( parent ), mIncType( inctype ) { if ( alarm ) { mAlarm = new KCal::Alarm( *alarm ); @@ -188,9 +188,9 @@ void AlarmListViewItem::construct() KOEditorAlarms::KOEditorAlarms( const TQCString &type, - KCal::Alarm::List *alarms, TQWidget *tqparent, + KCal::Alarm::List *alarms, TQWidget *parent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("Advanced Reminders"), Ok | Cancel ), + : KDialogBase( parent, name, true, i18n("Advanced Reminders"), Ok | Cancel ), mType( type ), mAlarms( alarms ),mCurrentItem( 0 ) { if ( mType != "Todo" ) { diff --git a/korganizer/koeditoralarms.h b/korganizer/koeditoralarms.h index 399a4693a..4454a587c 100644 --- a/korganizer/koeditoralarms.h +++ b/korganizer/koeditoralarms.h @@ -37,7 +37,7 @@ class KOEditorAlarms : public KDialogBase TQ_OBJECT public: KOEditorAlarms( const TQCString &type, - KCal::Alarm::List *alarms, TQWidget *tqparent = 0, + KCal::Alarm::List *alarms, TQWidget *parent = 0, const char *name = 0 ); ~KOEditorAlarms(); diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index d6534db3b..a127885ee 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -73,8 +73,8 @@ class AttachmentListItem : public KIconViewItem { public: - AttachmentListItem( KCal::Attachment*att, TQIconView *tqparent ) : - KIconViewItem( tqparent ) + AttachmentListItem( KCal::Attachment*att, TQIconView *parent ) : + KIconViewItem( parent ) { if ( att ) { mAttachment = new KCal::Attachment( *att ); @@ -164,8 +164,8 @@ class AttachmentListItem : public KIconViewItem }; AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item, - TQWidget *tqparent ) - : KDialogBase ( Plain, i18n( "Add Attachment" ), Ok|Cancel, Ok, tqparent, 0, false, false ), + TQWidget *parent ) + : KDialogBase ( Plain, i18n( "Add Attachment" ), Ok|Cancel, Ok, parent, 0, false, false ), mItem( item ), mURLRequester( 0 ) { TQFrame *topFrame = plainPage(); @@ -313,9 +313,9 @@ void AttachmentEditDialog::urlSelected( const TQString &url ) mIcon->setPixmap( AttachmentListItem::icon( mMimeType, kurl.path() ) ); } -AttachmentIconView::AttachmentIconView( KOEditorAttachments* tqparent ) - : KIconView( tqparent ), - mParent( tqparent ) +AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent ) + : KIconView( parent ), + mParent( parent ) { setSelectionMode( TQIconView::Extended ); setMode( KIconView::Select ); @@ -447,9 +447,9 @@ void AttachmentIconView::dragEnterEvent( TQDragEnterEvent *event ) mParent->dragEnterEvent( event ); } -KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *tqparent, +KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { TQBoxLayout *topLayout = new TQHBoxLayout( this ); topLayout->setSpacing( spacing ); diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h index b5df45c67..a95c49992 100644 --- a/korganizer/koeditorattachments.h +++ b/korganizer/koeditorattachments.h @@ -59,7 +59,7 @@ class AttachmentEditDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - AttachmentEditDialog( AttachmentListItem *item, TQWidget *tqparent=0 ); + AttachmentEditDialog( AttachmentListItem *item, TQWidget *parent=0 ); void accept(); @@ -83,7 +83,7 @@ class KOEditorAttachments : public TQWidget Q_OBJECT TQ_OBJECT public: - KOEditorAttachments( int spacing = 8, TQWidget *tqparent = 0, + KOEditorAttachments( int spacing = 8, TQWidget *parent = 0, const char *name = 0 ); ~KOEditorAttachments(); @@ -156,7 +156,7 @@ class AttachmentIconView : public KIconView friend class KOEditorAttachments; public: - AttachmentIconView( KOEditorAttachments* tqparent=0 ); + AttachmentIconView( KOEditorAttachments* parent=0 ); KURL tempFileForAttachment( KCal::Attachment *attachment ); TQDragObject *mimeData(); ~AttachmentIconView(); diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 40b0168dc..d5f397f30 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -91,8 +91,8 @@ void CustomListViewItem<KCal::Attendee *>::updateItem() setText(6, mData->delegator()); } -KOAttendeeListView::KOAttendeeListView ( TQWidget *tqparent, const char *name ) - : KListView(tqparent, name) +KOAttendeeListView::KOAttendeeListView ( TQWidget *parent, const char *name ) + : KListView(parent, name) { setAcceptDrops( true ); setAllColumnsShowFocus( true ); @@ -178,9 +178,9 @@ void KOAttendeeListView::dropEvent( TQDropEvent *e ) } -KOEditorDetails::KOEditorDetails( int spacing, TQWidget *tqparent, +KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent, const char *name ) - : KOAttendeeEditor( tqparent, name), mDisableItemUpdate( false ) + : KOAttendeeEditor( parent, name), mDisableItemUpdate( false ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( spacing ); diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h index 697c46406..b03d0a1bb 100644 --- a/korganizer/koeditordetails.h +++ b/korganizer/koeditordetails.h @@ -62,7 +62,7 @@ class KOAttendeeListView : public KListView Q_OBJECT TQ_OBJECT public: - KOAttendeeListView (TQWidget *tqparent=0, const char *name=0); + KOAttendeeListView (TQWidget *parent=0, const char *name=0); virtual ~KOAttendeeListView(); virtual void addAttendee( const TQString& newAttendee ); public slots: @@ -81,7 +81,7 @@ class KOEditorDetails : public KOAttendeeEditor Q_OBJECT TQ_OBJECT public: - KOEditorDetails (int spacing = 8,TQWidget* tqparent = 0, const char* name = 0); + KOEditorDetails (int spacing = 8,TQWidget* parent = 0, const char* name = 0); virtual ~KOEditorDetails(); /** Set widgets to default values */ diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index 362509935..70234dcc6 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -69,8 +69,8 @@ class FreeBusyItem : public KDGanttViewTaskItem { public: - FreeBusyItem( Attendee *attendee, KDGanttView *tqparent ) : - KDGanttViewTaskItem( tqparent, tqparent->lastItem() ), mAttendee( attendee ), mTimerID( 0 ), + FreeBusyItem( Attendee *attendee, KDGanttView *parent ) : + KDGanttViewTaskItem( parent, parent->lastItem() ), mAttendee( attendee ), mTimerID( 0 ), mIsDownloading( false ) { Q_ASSERT( attendee ); @@ -222,9 +222,9 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb ) //// -KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *tqparent, +KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, const char *name ) - : KOAttendeeEditor( tqparent, name ) + : KOAttendeeEditor( parent, name ) { TQVBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( spacing ); diff --git a/korganizer/koeditorfreebusy.h b/korganizer/koeditorfreebusy.h index ec870d22d..98e789c62 100644 --- a/korganizer/koeditorfreebusy.h +++ b/korganizer/koeditorfreebusy.h @@ -47,7 +47,7 @@ class KOEditorFreeBusy : public KOAttendeeEditor Q_OBJECT TQ_OBJECT public: - KOEditorFreeBusy( int spacing = 8, TQWidget *tqparent = 0, + KOEditorFreeBusy( int spacing = 8, TQWidget *parent = 0, const char *name = 0 ); virtual ~KOEditorFreeBusy(); diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index afbda6156..c19775e5e 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -68,8 +68,8 @@ #include "koeditorgeneral.moc" #include "kohelper.h" -KOEditorGeneral::KOEditorGeneral( TQObject *tqparent, const char* name) : - TQObject( tqparent, name ), mAttachments(0) +KOEditorGeneral::KOEditorGeneral( TQObject *parent, const char* name) : + TQObject( parent, name ), mAttachments(0) { mType = "Event"; ResourceCached::setEditorWindowOpen(true); @@ -82,8 +82,8 @@ KOEditorGeneral::~KOEditorGeneral() } -FocusLineEdit::FocusLineEdit( TQWidget *tqparent ) - : TQLineEdit( tqparent ), mSkipFirst( true ) +FocusLineEdit::FocusLineEdit( TQWidget *parent ) + : TQLineEdit( parent ), mSkipFirst( true ) { } @@ -98,37 +98,37 @@ void FocusLineEdit::focusInEvent ( TQFocusEvent *e ) } -void KOEditorGeneral::initHeader( TQWidget *tqparent,TQBoxLayout *topLayout) +void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout) { TQGridLayout *headerLayout = new TQGridLayout(); headerLayout->setSpacing( topLayout->spacing() ); topLayout->addLayout( headerLayout ); TQString whatsThis = i18n("Sets the Title of this event or to-do."); - TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), tqparent ); + TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), parent ); TQWhatsThis::add( summaryLabel, whatsThis ); TQFont f = summaryLabel->font(); f.setBold( true ); summaryLabel->setFont(f); headerLayout->addWidget(summaryLabel,1,0); - mSummaryEdit = new FocusLineEdit( tqparent ); + mSummaryEdit = new FocusLineEdit( parent ); TQWhatsThis::add( mSummaryEdit, whatsThis ); connect( mSummaryEdit, TQT_SIGNAL( focusReceivedSignal() ), TQT_SIGNAL( focusReceivedSignal() ) ); headerLayout->addWidget(mSummaryEdit,1,1); summaryLabel->setBuddy( mSummaryEdit ); - mAttendeeSummaryLabel = new TQLabel( tqparent ); + mAttendeeSummaryLabel = new TQLabel( parent ); updateAttendeeSummary( 0 ); headerLayout->addWidget( mAttendeeSummaryLabel, 1, 2 ); whatsThis = i18n("Sets where the event or to-do will take place."); - TQLabel *locationLabel = new TQLabel( i18n("&Location:"), tqparent ); + TQLabel *locationLabel = new TQLabel( i18n("&Location:"), parent ); TQWhatsThis::add( locationLabel, whatsThis ); headerLayout->addWidget(locationLabel,2,0); - mLocationEdit = new TQLineEdit( tqparent ); + mLocationEdit = new TQLineEdit( parent ); TQWhatsThis::add( mLocationEdit, whatsThis ); headerLayout->addMultiCellWidget( mLocationEdit, 2, 2, 1, 2 ); locationLabel->setBuddy( mLocationEdit ); @@ -136,31 +136,31 @@ void KOEditorGeneral::initHeader( TQWidget *tqparent,TQBoxLayout *topLayout) TQBoxLayout *thirdLineLayout = new TQHBoxLayout(); headerLayout->addMultiCellLayout( thirdLineLayout, 3, 3, 0, 2 ); - mResourceLabel = new TQLabel( tqparent ); + mResourceLabel = new TQLabel( parent ); mResourceLabel->hide(); thirdLineLayout->addWidget( mResourceLabel ); whatsThis = i18n("Allows you to select the categories that this event or to-do belongs to."); - TQLabel *categoriesLabel = new TQLabel( i18n("Categories:"), tqparent ); + TQLabel *categoriesLabel = new TQLabel( i18n("Categories:"), parent ); TQWhatsThis::add( categoriesLabel, whatsThis ); thirdLineLayout->addWidget( categoriesLabel ); - mCategoriesLabel = new KSqueezedTextLabel( tqparent ); + mCategoriesLabel = new KSqueezedTextLabel( parent ); TQWhatsThis::add( mCategoriesLabel, whatsThis ); mCategoriesLabel->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); thirdLineLayout->addWidget( mCategoriesLabel ); - mCategoriesButton = new TQPushButton( tqparent ); + mCategoriesButton = new TQPushButton( parent ); mCategoriesButton->setText(i18n("Select...")); TQWhatsThis::add( mCategoriesButton, whatsThis ); connect(mCategoriesButton,TQT_SIGNAL(clicked()),TQT_SLOT(selectCategories())); thirdLineLayout->addWidget( mCategoriesButton ); } -void KOEditorGeneral::initSecrecy(TQWidget *tqparent, TQBoxLayout *topLayout) +void KOEditorGeneral::initSecrecy(TQWidget *parent, TQBoxLayout *topLayout) { TQBoxLayout *secrecyLayout = new TQHBoxLayout( topLayout ); - TQLabel *secrecyLabel = new TQLabel(i18n("Acc&ess:"),tqparent); + TQLabel *secrecyLabel = new TQLabel(i18n("Acc&ess:"),parent); TQString whatsThis = i18n("Sets whether the access to this event or to-do " "is restricted. Please note that KOrganizer " "currently does not use this setting, so the " @@ -171,16 +171,16 @@ void KOEditorGeneral::initSecrecy(TQWidget *tqparent, TQBoxLayout *topLayout) TQWhatsThis::add( secrecyLabel, whatsThis ); secrecyLayout->addWidget(secrecyLabel); - mSecrecyCombo = new TQComboBox(tqparent); + mSecrecyCombo = new TQComboBox(parent); TQWhatsThis::add( mSecrecyCombo, whatsThis ); mSecrecyCombo->insertStringList(Incidence::secrecyList()); secrecyLayout->addWidget(mSecrecyCombo); secrecyLabel->setBuddy( mSecrecyCombo ); } -void KOEditorGeneral::initDescription(TQWidget *tqparent,TQBoxLayout *topLayout) +void KOEditorGeneral::initDescription(TQWidget *parent,TQBoxLayout *topLayout) { - mDescriptionEdit = new KTextEdit(tqparent); + mDescriptionEdit = new KTextEdit(parent); TQWhatsThis::add( mDescriptionEdit, i18n("Sets the description for this event or to-do. This " "will be displayed in a reminder if one is set, " @@ -194,16 +194,16 @@ void KOEditorGeneral::initDescription(TQWidget *tqparent,TQBoxLayout *topLayout) topLayout->addWidget(mDescriptionEdit, 4); } -void KOEditorGeneral::initAlarm( TQWidget *tqparent, TQBoxLayout *topLayout ) +void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) { TQBoxLayout *alarmLayout = new TQHBoxLayout( topLayout ); - mAlarmButton = new TQCheckBox( tqparent ); + mAlarmButton = new TQCheckBox( parent ); TQWhatsThis::add( mAlarmButton, i18n( "Enable reminders for this event or to-do." ) ); TQToolTip::add( mAlarmButton, i18n( "Enable reminders" ) ); alarmLayout->addWidget( mAlarmButton ); - mAlarmAdvancedButton = new TQPushButton( tqparent ); + mAlarmAdvancedButton = new TQPushButton( parent ); mAlarmAdvancedButton->setIconSet( KOGlobals::self()->smallIconSet( "bell", 16 ) ); TQWhatsThis::add( mAlarmAdvancedButton, i18n( "Push this button to create an advanced set of reminders " @@ -212,7 +212,7 @@ void KOEditorGeneral::initAlarm( TQWidget *tqparent, TQBoxLayout *topLayout ) connect( mAlarmAdvancedButton, TQT_SIGNAL(clicked()), TQT_SLOT(editAlarms()) ); alarmLayout->addWidget( mAlarmAdvancedButton ); - mSimpleAlarmBox = new TQHBox( tqparent ); + mSimpleAlarmBox = new TQHBox( parent ); alarmLayout->addWidget( mSimpleAlarmBox ); TQString whatsThis, toolTip; @@ -235,7 +235,7 @@ void KOEditorGeneral::initAlarm( TQWidget *tqparent, TQBoxLayout *topLayout ) TQWhatsThis::add( mAlarmIncrCombo, whatsThis ); TQToolTip::add( mAlarmIncrCombo, toolTip ); - mAlarmInfoLabel = new TQLabel( tqparent ); + mAlarmInfoLabel = new TQLabel( parent ); if ( mType == "Event" ) { mAlarmInfoLabel->setText( i18n( "before the start" ) ); } else { @@ -253,9 +253,9 @@ void KOEditorGeneral::initAlarm( TQWidget *tqparent, TQBoxLayout *topLayout ) connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQT_SLOT(setEnabled(bool)) ); } -void KOEditorGeneral::initAttachments(TQWidget *tqparent,TQBoxLayout *topLayout) +void KOEditorGeneral::initAttachments(TQWidget *parent,TQBoxLayout *topLayout) { - mAttachments = new KOEditorAttachments( KDialog::spacingHint(), tqparent ); + mAttachments = new KOEditorAttachments( KDialog::spacingHint(), parent ); connect( mAttachments, TQT_SIGNAL( openURL( const KURL & ) ) , this, TQT_SIGNAL( openURL( const KURL & ) ) ); topLayout->addWidget( mAttachments, 1 ); diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h index d67305cf1..69d986e12 100644 --- a/korganizer/koeditorgeneral.h +++ b/korganizer/koeditorgeneral.h @@ -51,7 +51,7 @@ class FocusLineEdit : public TQLineEdit Q_OBJECT TQ_OBJECT public: - FocusLineEdit( TQWidget *tqparent ); + FocusLineEdit( TQWidget *parent ); signals: void focusReceivedSignal(); @@ -68,10 +68,10 @@ class KOEditorGeneral : public TQObject Q_OBJECT TQ_OBJECT public: - KOEditorGeneral (TQObject* tqparent=0,const char* name=0); + KOEditorGeneral (TQObject* parent=0,const char* name=0); virtual ~KOEditorGeneral(); - void initHeader( TQWidget *tqparent,TQBoxLayout *topLayout ); + void initHeader( TQWidget *parent,TQBoxLayout *topLayout ); void initDescription(TQWidget *,TQBoxLayout *); void initSecrecy(TQWidget *,TQBoxLayout *); void initAlarm(TQWidget *,TQBoxLayout *); diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 0849682ec..a3154781c 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -56,9 +56,9 @@ #include "koeditorgeneralevent.h" #include "koeditorgeneralevent.moc" -KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* tqparent, +KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* parent, const char* name) : - KOEditorGeneral( tqparent, name) + KOEditorGeneral( parent, name) { connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), TQT_SLOT( setDuration() ) ); @@ -91,12 +91,12 @@ void KOEditorGeneralEvent::finishSetup() mSummaryEdit->setFocus(); } -void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) +void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) { TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout); TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal, - i18n("Date && Time"),tqparent); + i18n("Date && Time"),parent); TQWhatsThis::add( timeGroupBox, i18n("Sets options related to the date and time of the " "event or to-do.") ); @@ -175,17 +175,17 @@ void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) initClass( timeBoxFrame, classLayout ); } -void KOEditorGeneralEvent::initClass(TQWidget *tqparent,TQBoxLayout *topLayout) +void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout) { TQBoxLayout *classLayout = new TQHBoxLayout(topLayout); - TQLabel *freeTimeLabel = new TQLabel(i18n("S&how time as:"),tqparent); + TQLabel *freeTimeLabel = new TQLabel(i18n("S&how time as:"),parent); TQString whatsThis = i18n("Sets how this time will appear on your Free/Busy " "information."); TQWhatsThis::add( freeTimeLabel, whatsThis ); classLayout->addWidget(freeTimeLabel); - mFreeTimeCombo = new TQComboBox(false, tqparent); + mFreeTimeCombo = new TQComboBox(false, parent); TQWhatsThis::add( mFreeTimeCombo, whatsThis ); mFreeTimeCombo->insertItem(i18n("Busy")); mFreeTimeCombo->insertItem(i18n("Free")); @@ -193,10 +193,10 @@ void KOEditorGeneralEvent::initClass(TQWidget *tqparent,TQBoxLayout *topLayout) freeTimeLabel->setBuddy( mFreeTimeCombo ); } -void KOEditorGeneralEvent::initInvitationBar(TQWidget * tqparent, TQBoxLayout * tqlayout) +void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout) { TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout ); - mInvitationBar = new TQFrame( tqparent ); + mInvitationBar = new TQFrame( parent ); mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() ); topLayout->addWidget( mInvitationBar ); diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h index 83b09ecc5..734826eb9 100644 --- a/korganizer/koeditorgeneralevent.h +++ b/korganizer/koeditorgeneralevent.h @@ -44,12 +44,12 @@ class KOEditorGeneralEvent : public KOEditorGeneral Q_OBJECT TQ_OBJECT public: - KOEditorGeneralEvent (TQObject* tqparent=0,const char* name=0); + KOEditorGeneralEvent (TQObject* parent=0,const char* name=0); virtual ~KOEditorGeneralEvent(); void initTime(TQWidget *,TQBoxLayout *); void initClass(TQWidget *,TQBoxLayout *); - void initInvitationBar( TQWidget* tqparent, TQBoxLayout *tqlayout ); + void initInvitationBar( TQWidget* parent, TQBoxLayout *tqlayout ); void finishSetup(); diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index 2211c97da..25372ba49 100644 --- a/korganizer/koeditorgeneraljournal.cpp +++ b/korganizer/koeditorgeneraljournal.cpp @@ -45,9 +45,9 @@ #include <tqwhatsthis.h> -KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *tqparent, +KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *parent, const char *name ) - : KOEditorGeneral( TQT_TQOBJECT(tqparent), name ) + : KOEditorGeneral( TQT_TQOBJECT(parent), name ) { setType( "Journal" ); } @@ -56,43 +56,43 @@ KOEditorGeneralJournal::~KOEditorGeneralJournal() { } -void KOEditorGeneralJournal::initTitle( TQWidget *tqparent, TQBoxLayout *topLayout ) +void KOEditorGeneralJournal::initTitle( TQWidget *parent, TQBoxLayout *topLayout ) { TQHBoxLayout *hbox = new TQHBoxLayout( topLayout ); TQString whatsThis = i18n("Sets the title of this journal."); - TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), tqparent ); + TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), parent ); TQWhatsThis::add( summaryLabel, whatsThis ); TQFont f = summaryLabel->font(); f.setBold( true ); summaryLabel->setFont( f ); hbox->addWidget( summaryLabel ); - mSummaryEdit = new FocusLineEdit( tqparent ); + mSummaryEdit = new FocusLineEdit( parent ); TQWhatsThis::add( mSummaryEdit, whatsThis ); summaryLabel->setBuddy( mSummaryEdit ); hbox->addWidget( mSummaryEdit ); } -void KOEditorGeneralJournal::initDate( TQWidget *tqparent, TQBoxLayout *topLayout ) +void KOEditorGeneralJournal::initDate( TQWidget *parent, TQBoxLayout *topLayout ) { // TQBoxLayout *dateLayout = new TQVBoxLayout(topLayout); TQBoxLayout *dateLayout = new TQHBoxLayout( topLayout ); - mDateLabel = new TQLabel( i18n("&Date:"), tqparent); + mDateLabel = new TQLabel( i18n("&Date:"), parent); dateLayout->addWidget( mDateLabel ); - mDateEdit = new KDateEdit( tqparent ); + mDateEdit = new KDateEdit( parent ); dateLayout->addWidget( mDateEdit ); mDateLabel->setBuddy( mDateEdit ); dateLayout->addStretch(); - mTimeCheckBox = new TQCheckBox( i18n("&Time: "), tqparent ); + mTimeCheckBox = new TQCheckBox( i18n("&Time: "), parent ); dateLayout->addWidget( mTimeCheckBox ); - mTimeEdit = new KTimeEdit( tqparent ); + mTimeEdit = new KTimeEdit( parent ); dateLayout->addWidget( mTimeEdit ); connect( mTimeCheckBox, TQT_SIGNAL(toggled(bool)), mTimeEdit, TQT_SLOT(setEnabled(bool)) ); @@ -120,9 +120,9 @@ kdDebug()<<"KOEditorGeneralJournal::setTime, time is valid"<<endl; } } -void KOEditorGeneralJournal::initDescription( TQWidget *tqparent, TQBoxLayout *topLayout ) +void KOEditorGeneralJournal::initDescription( TQWidget *parent, TQBoxLayout *topLayout ) { - mDescriptionEdit = new KTextEdit( tqparent ); + mDescriptionEdit = new KTextEdit( parent ); mDescriptionEdit->append(""); mDescriptionEdit->setReadOnly( false ); mDescriptionEdit->setOverwriteMode( false ); diff --git a/korganizer/koeditorgeneraljournal.h b/korganizer/koeditorgeneraljournal.h index f8155ea20..88288c30d 100644 --- a/korganizer/koeditorgeneraljournal.h +++ b/korganizer/koeditorgeneraljournal.h @@ -50,12 +50,12 @@ class KOEditorGeneralJournal : public KOEditorGeneral Q_OBJECT TQ_OBJECT public: - KOEditorGeneralJournal ( TQWidget *tqparent=0, const char* name=0 ); + KOEditorGeneralJournal ( TQWidget *parent=0, const char* name=0 ); virtual ~KOEditorGeneralJournal(); void initDate( TQWidget *, TQBoxLayout * ); void initDescription( TQWidget *, TQBoxLayout * ); - void initTitle( TQWidget *tqparent, TQBoxLayout *topLayout ); + void initTitle( TQWidget *parent, TQBoxLayout *topLayout ); /** Set widgets to default values */ void setDefaults( const TQDate &date ); diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index af001503f..8fbca6e1a 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -56,8 +56,8 @@ #include "koeditorgeneraltodo.h" #include "koeditorgeneraltodo.moc" -KOEditorGeneralTodo::KOEditorGeneralTodo( TQObject *tqparent, const char *name ) - : KOEditorGeneral( tqparent, name ) +KOEditorGeneralTodo::KOEditorGeneralTodo( TQObject *parent, const char *name ) + : KOEditorGeneral( parent, name ) { setType( "Todo" ); } @@ -91,13 +91,13 @@ void KOEditorGeneralTodo::finishSetup() mSummaryEdit->setFocus(); } -void KOEditorGeneralTodo::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) +void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) { kdDebug(5850) << k_funcinfo << endl; TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout); TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal, - i18n("Date && Time"),tqparent); + i18n("Date && Time"),parent); timeLayout->addWidget(timeGroupBox); TQFrame *timeBoxFrame = new TQFrame(timeGroupBox); @@ -182,14 +182,14 @@ void KOEditorGeneralTodo::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) } -void KOEditorGeneralTodo::initCompletion( TQWidget *tqparent, TQBoxLayout *topLayout ) +void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayout ) { TQHBoxLayout *completionLayout = new TQHBoxLayout( topLayout ); - TQLabel *label = new TQLabel( i18n( "&Completed:" ), tqparent ); + TQLabel *label = new TQLabel( i18n( "&Completed:" ), parent ); completionLayout->addWidget( label ); - mCompletedToggle = new TQCheckBox( tqparent ); + mCompletedToggle = new TQCheckBox( parent ); TQToolTip::add( mCompletedToggle, i18n( "Toggle between 0% and 100% complete" ) ); TQWhatsThis::add( mCompletedToggle, @@ -199,7 +199,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *tqparent, TQBoxLayout *topLa completionLayout->addWidget( mCompletedToggle ); label->setBuddy( mCompletedToggle ); - mCompletedCombo = new TQComboBox( tqparent ); + mCompletedCombo = new TQComboBox( parent ); TQToolTip::add( mCompletedCombo, i18n( "Select the completed percentage" ) ); TQWhatsThis::add( mCompletedCombo, @@ -212,25 +212,25 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *tqparent, TQBoxLayout *topLa connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) ); completionLayout->addWidget( mCompletedCombo ); - mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), tqparent ); + mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), parent ); mCompletedLabel->hide(); completionLayout->addWidget( mCompletedLabel ); - mCompletionDateEdit = new KDateEdit( tqparent ); + mCompletionDateEdit = new KDateEdit( parent ); mCompletionDateEdit->hide(); completionLayout->addWidget( mCompletionDateEdit ); - mCompletionTimeEdit = new KTimeEdit( tqparent, TQTime() ); + mCompletionTimeEdit = new KTimeEdit( parent, TQTime() ); mCompletionTimeEdit->hide(); completionLayout->addWidget( mCompletionTimeEdit ); } -void KOEditorGeneralTodo::initPriority(TQWidget *tqparent, TQBoxLayout *topLayout) +void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout) { - TQLabel *priorityLabel = new TQLabel( i18n( "&Priority:" ), tqparent ); + TQLabel *priorityLabel = new TQLabel( i18n( "&Priority:" ), parent ); topLayout->addWidget( priorityLabel ); - mPriorityCombo = new TQComboBox( tqparent ); + mPriorityCombo = new TQComboBox( parent ); TQToolTip::add( mPriorityCombo, i18n( "Set the priority of the to-do" ) ); TQWhatsThis::add( mPriorityCombo, @@ -252,15 +252,15 @@ void KOEditorGeneralTodo::initPriority(TQWidget *tqparent, TQBoxLayout *topLayou priorityLabel->setBuddy( mPriorityCombo ); } -void KOEditorGeneralTodo::initqStatus(TQWidget *tqparent,TQBoxLayout *topLayout) +void KOEditorGeneralTodo::initqStatus(TQWidget *parent,TQBoxLayout *topLayout) { TQBoxLayout *statusLayout = new TQHBoxLayout(topLayout); - initCompletion( tqparent, statusLayout ); + initCompletion( parent, statusLayout ); statusLayout->addStretch( 1 ); - initPriority( tqparent, statusLayout ); + initPriority( parent, statusLayout ); } void KOEditorGeneralTodo::setDefaults( const TQDateTime &due, bool allDay ) diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h index cd50285eb..27ffdc270 100644 --- a/korganizer/koeditorgeneraltodo.h +++ b/korganizer/koeditorgeneraltodo.h @@ -44,7 +44,7 @@ class KOEditorGeneralTodo : public KOEditorGeneral Q_OBJECT TQ_OBJECT public: - KOEditorGeneralTodo (TQObject* tqparent=0,const char* name=0); + KOEditorGeneralTodo (TQObject* parent=0,const char* name=0); virtual ~KOEditorGeneralTodo(); void initTime(TQWidget *, TQBoxLayout *); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index d55dfa3ae..976a03264 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -60,8 +60,8 @@ /////////////////////////// RecurBase /////////////////////////////// -RecurBase::RecurBase( TQWidget *tqparent, const char *name ) : - TQWidget( tqparent, name ) +RecurBase::RecurBase( TQWidget *parent, const char *name ) : + TQWidget( parent, name ) { mFrequencyEdit = new TQSpinBox( 1, 9999, 1, this ); mFrequencyEdit->setValue( 1 ); @@ -84,9 +84,9 @@ int RecurBase::frequency() return mFrequencyEdit->value(); } -TQComboBox *RecurBase::createWeekCountCombo( TQWidget *tqparent, const char *name ) +TQComboBox *RecurBase::createWeekCountCombo( TQWidget *parent, const char *name ) { - TQComboBox *combo = new TQComboBox( tqparent, name ); + TQComboBox *combo = new TQComboBox( parent, name ); TQWhatsThis::add( combo, i18n("The number of the week from the beginning " "of the month on which this event or to-do " @@ -105,9 +105,9 @@ TQComboBox *RecurBase::createWeekCountCombo( TQWidget *tqparent, const char *nam return combo; } -TQComboBox *RecurBase::createWeekdayCombo( TQWidget *tqparent, const char *name ) +TQComboBox *RecurBase::createWeekdayCombo( TQWidget *parent, const char *name ) { - TQComboBox *combo = new TQComboBox( tqparent, name ); + TQComboBox *combo = new TQComboBox( parent, name ); TQWhatsThis::add( combo, i18n("The weekday on which this event or to-do " "should recur.") ); @@ -119,9 +119,9 @@ TQComboBox *RecurBase::createWeekdayCombo( TQWidget *tqparent, const char *name return combo; } -TQComboBox *RecurBase::createMonthNameCombo( TQWidget *tqparent, const char *name ) +TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name ) { - TQComboBox *combo = new TQComboBox( tqparent, name ); + TQComboBox *combo = new TQComboBox( parent, name ); TQWhatsThis::add( combo, i18n("The month during which this event or to-do " "should recur.") ); @@ -135,13 +135,13 @@ TQComboBox *RecurBase::createMonthNameCombo( TQWidget *tqparent, const char *nam return combo; } -TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *tqparent, TQLayout *tqlayout, +TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout, TQString everyText, TQString unitText ) { TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout ); TQString whatsThis = i18n("Sets how often this event or to-do should recur."); - TQLabel *preLabel = new TQLabel( everyText, tqparent ); + TQLabel *preLabel = new TQLabel( everyText, parent ); TQWhatsThis::add( preLabel, whatsThis ); freqLayout->addWidget( preLabel ); @@ -149,7 +149,7 @@ TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *tqparent, TQLayout *tq preLabel->setBuddy( frequencyEdit() ); TQWhatsThis::add( preLabel->buddy(), whatsThis ); - TQLabel *postLabel = new TQLabel( unitText, tqparent ); + TQLabel *postLabel = new TQLabel( unitText, parent ); TQWhatsThis::add( postLabel, whatsThis ); freqLayout->addWidget( postLabel ); freqLayout->addStretch(); @@ -158,8 +158,8 @@ TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *tqparent, TQLayout *tq /////////////////////////// RecurDaily /////////////////////////////// -RecurDaily::RecurDaily( TQWidget *tqparent, const char *name ) : - RecurBase( tqparent, name ) +RecurDaily::RecurDaily( TQWidget *parent, const char *name ) : + RecurBase( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -170,8 +170,8 @@ RecurDaily::RecurDaily( TQWidget *tqparent, const char *name ) : /////////////////////////// RecurWeekly /////////////////////////////// -RecurWeekly::RecurWeekly( TQWidget *tqparent, const char *name ) : - RecurBase( tqparent, name ) +RecurWeekly::RecurWeekly( TQWidget *parent, const char *name ) : + RecurBase( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -223,8 +223,8 @@ TQBitArray RecurWeekly::days() /////////////////////////// RecurMonthly /////////////////////////////// -RecurMonthly::RecurMonthly( TQWidget *tqparent, const char *name ) : - RecurBase( tqparent, name ) +RecurMonthly::RecurMonthly( TQWidget *parent, const char *name ) : + RecurBase( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -396,8 +396,8 @@ int RecurMonthly::weekday() /////////////////////////// RecurYearly /////////////////////////////// -RecurYearly::RecurYearly( TQWidget *tqparent, const char *name ) : - RecurBase( tqparent, name ) +RecurYearly::RecurYearly( TQWidget *parent, const char *name ) : + RecurBase( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -573,8 +573,8 @@ int RecurYearly::day() //////////////////////////// ExceptionsWidget ////////////////////////// -ExceptionsWidget::ExceptionsWidget( TQWidget *tqparent, const char *name ) : - TQWidget( tqparent, name ) +ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) : + TQWidget( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -675,8 +675,8 @@ DateList ExceptionsWidget::dates() ///////////////////////// ExceptionsDialog /////////////////////////// -ExceptionsDialog::ExceptionsDialog( TQWidget *tqparent, const char *name ) : - KDialogBase( tqparent, name, true, i18n("Edit Exceptions"), Ok|Cancel ) +ExceptionsDialog::ExceptionsDialog( TQWidget *parent, const char *name ) : + KDialogBase( parent, name, true, i18n("Edit Exceptions"), Ok|Cancel ) { mExceptions = new ExceptionsWidget( this ); setMainWidget( mExceptions ); @@ -694,9 +694,9 @@ DateList ExceptionsDialog::dates() ///////////////////////// RecurrenceRangeWidget /////////////////////////// -RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *tqparent, +RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -829,9 +829,9 @@ void RecurrenceRangeWidget::setDateTimes( const TQDateTime &start, ///////////////////////// RecurrenceRangeDialog /////////////////////////// -RecurrenceRangeDialog::RecurrenceRangeDialog( TQWidget *tqparent, +RecurrenceRangeDialog::RecurrenceRangeDialog( TQWidget *parent, const char *name ) : - KDialogBase( tqparent, name, true, i18n("Edit Recurrence Range"), Ok|Cancel ) + KDialogBase( parent, name, true, i18n("Edit Recurrence Range"), Ok|Cancel ) { mRecurrenceRangeWidget = new RecurrenceRangeWidget( this ); setMainWidget( mRecurrenceRangeWidget ); @@ -870,8 +870,8 @@ void RecurrenceRangeDialog::setDateTimes( const TQDateTime &start, //////////////////////////// RecurrenceChooser //////////////////////// -RecurrenceChooser::RecurrenceChooser( TQWidget *tqparent, const char *name ) : - TQWidget( tqparent, name ) +RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) : + TQWidget( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -965,8 +965,8 @@ void RecurrenceChooser::emitChoice() /////////////////////////////// Main Widget ///////////////////////////// -KOEditorRecurrence::KOEditorRecurrence( TQWidget* tqparent, const char *name ) : - TQWidget( tqparent, name ) +KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : + TQWidget( parent, name ) { TQGridLayout *topLayout = new TQGridLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -1633,8 +1633,8 @@ void KOEditorRecurrence::restoreValues() mExceptions->setDates( mSaveRec.exDates() ); } -KOEditorRecurrenceDialog::KOEditorRecurrenceDialog(TQWidget * tqparent) - : KDialogBase( tqparent, 0, false, i18n("Recurrence"), Ok|Cancel ), mRecurEnabled( false ) +KOEditorRecurrenceDialog::KOEditorRecurrenceDialog(TQWidget * parent) + : KDialogBase( parent, 0, false, i18n("Recurrence"), Ok|Cancel ), mRecurEnabled( false ) { mRecurrence = new KOEditorRecurrence( this ); setMainWidget( mRecurrence ); diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h index 3060d660a..1592f4272 100644 --- a/korganizer/koeditorrecurrence.h +++ b/korganizer/koeditorrecurrence.h @@ -47,7 +47,7 @@ using namespace KCal; class RecurBase : public TQWidget { public: - RecurBase( TQWidget *tqparent = 0, const char *name = 0 ); + RecurBase( TQWidget *parent = 0, const char *name = 0 ); void setFrequency( int ); int frequency(); @@ -58,10 +58,10 @@ class RecurBase : public TQWidget TQWidget *frequencyEdit(); protected: - static TQComboBox *createWeekCountCombo( TQWidget *tqparent=0, const char *name=0 ); - static TQComboBox *createWeekdayCombo( TQWidget *tqparent=0, const char *name=0 ); - static TQComboBox *createMonthNameCombo( TQWidget *tqparent=0, const char *name=0 ); - TQBoxLayout *createFrequencySpinBar( TQWidget *tqparent, TQLayout *tqlayout, + static TQComboBox *createWeekCountCombo( TQWidget *parent=0, const char *name=0 ); + static TQComboBox *createWeekdayCombo( TQWidget *parent=0, const char *name=0 ); + static TQComboBox *createMonthNameCombo( TQWidget *parent=0, const char *name=0 ); + TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout, TQString everyText, TQString unitText ); private: @@ -71,13 +71,13 @@ class RecurBase : public TQWidget class RecurDaily : public RecurBase { public: - RecurDaily( TQWidget *tqparent = 0, const char *name = 0 ); + RecurDaily( TQWidget *parent = 0, const char *name = 0 ); }; class RecurWeekly : public RecurBase { public: - RecurWeekly( TQWidget *tqparent = 0, const char *name = 0 ); + RecurWeekly( TQWidget *parent = 0, const char *name = 0 ); void setDays( const TQBitArray & ); TQBitArray days(); @@ -89,7 +89,7 @@ class RecurWeekly : public RecurBase class RecurMonthly : public RecurBase { public: - RecurMonthly( TQWidget *tqparent = 0, const char *name = 0 ); + RecurMonthly( TQWidget *parent = 0, const char *name = 0 ); void setByDay( int day ); void setByPos( int count, int weekday ); @@ -116,7 +116,7 @@ class RecurYearly : public RecurBase public: enum YearlyType { byDay, byPos, byMonth }; - RecurYearly( TQWidget *tqparent = 0, const char *name = 0 ); + RecurYearly( TQWidget *parent = 0, const char *name = 0 ); void setByDay( int day ); void setByPos( int count, int weekday, int month ); @@ -151,7 +151,7 @@ class RecurrenceChooser : public TQWidget Q_OBJECT TQ_OBJECT public: - RecurrenceChooser( TQWidget *tqparent = 0, const char *name = 0 ); + RecurrenceChooser( TQWidget *parent = 0, const char *name = 0 ); enum { Daily, Weekly, Monthly, Yearly }; @@ -185,7 +185,7 @@ class ExceptionsWidget : public TQWidget, public ExceptionsBase Q_OBJECT TQ_OBJECT public: - ExceptionsWidget( TQWidget *tqparent = 0, const char *name = 0 ); + ExceptionsWidget( TQWidget *parent = 0, const char *name = 0 ); void setDates( const DateList & ); DateList dates(); @@ -204,7 +204,7 @@ class ExceptionsWidget : public TQWidget, public ExceptionsBase class ExceptionsDialog : public KDialogBase, public ExceptionsBase { public: - ExceptionsDialog( TQWidget *tqparent, const char *name = 0 ); + ExceptionsDialog( TQWidget *parent, const char *name = 0 ); void setDates( const DateList & ); DateList dates(); @@ -233,7 +233,7 @@ class RecurrenceRangeWidget : public TQWidget, public RecurrenceRangeBase Q_OBJECT TQ_OBJECT public: - RecurrenceRangeWidget( TQWidget *tqparent = 0, const char *name = 0 ); + RecurrenceRangeWidget( TQWidget *parent = 0, const char *name = 0 ); void setDefaults( const TQDateTime &from ); @@ -262,7 +262,7 @@ class RecurrenceRangeWidget : public TQWidget, public RecurrenceRangeBase class RecurrenceRangeDialog : public KDialogBase, public RecurrenceRangeBase { public: - RecurrenceRangeDialog( TQWidget *tqparent = 0, const char *name = 0 ); + RecurrenceRangeDialog( TQWidget *parent = 0, const char *name = 0 ); void setDefaults( const TQDateTime &from ); @@ -284,7 +284,7 @@ class KOEditorRecurrence : public TQWidget Q_OBJECT TQ_OBJECT public: - KOEditorRecurrence ( TQWidget *tqparent = 0, const char *name = 0 ); + KOEditorRecurrence ( TQWidget *parent = 0, const char *name = 0 ); virtual ~KOEditorRecurrence(); enum { Daily, Weekly, Monthly, Yearly }; @@ -351,7 +351,7 @@ class KOEditorRecurrenceDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KOEditorRecurrenceDialog( TQWidget *tqparent ); + KOEditorRecurrenceDialog( TQWidget *parent ); KOEditorRecurrence* editor() const { return mRecurrence; } protected slots: diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index d7c1b1aa8..c73a67ac2 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -50,8 +50,8 @@ #include "koeventeditor.h" -KOEventEditor::KOEventEditor( Calendar *calendar, TQWidget *tqparent ) - : KOIncidenceEditor( TQString(), calendar, tqparent ), +KOEventEditor::KOEventEditor( Calendar *calendar, TQWidget *parent ) + : KOIncidenceEditor( TQString(), calendar, parent ), mEvent( 0 ), mCalendar( 0 ), mGeneral( 0 ), mRecurrence( 0 ), mFreeBusy( 0 ) { } @@ -307,7 +307,7 @@ bool KOEventEditor::processInput() mEvent->setOrganizer( Person( KOPrefs::instance()->fullName(), KOPrefs::instance()->email() ) ); writeEvent( mEvent ); - // NOTE: triggered by addIncidence, the kolab resource might open a non-modal dialog (tqparent is not available in the resource) to select a resource folder. Thus the user can close this dialog before addIncidence() returns. + // NOTE: triggered by addIncidence, the kolab resource might open a non-modal dialog (parent is not available in the resource) to select a resource folder. Thus the user can close this dialog before addIncidence() returns. if ( !mChanger->addIncidence( mEvent, mResource, mSubResource, this ) ) { delete mEvent; mEvent = 0; diff --git a/korganizer/koeventeditor.h b/korganizer/koeventeditor.h index c9559a1ee..870329303 100644 --- a/korganizer/koeventeditor.h +++ b/korganizer/koeventeditor.h @@ -53,7 +53,7 @@ class KOEventEditor : public KOIncidenceEditor /** Construct new event editor. */ - KOEventEditor( Calendar *calendar, TQWidget *tqparent ); + KOEventEditor( Calendar *calendar, TQWidget *parent ); virtual ~KOEventEditor(void); void init(); diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp index 8938d8d45..587a60d06 100644 --- a/korganizer/koeventview.cpp +++ b/korganizer/koeventview.cpp @@ -44,8 +44,8 @@ using namespace KOrg; //--------------------------------------------------------------------------- -KOEventView::KOEventView(Calendar *cal,TQWidget *tqparent,const char *name) - : KOrg::BaseView(cal,tqparent,name) +KOEventView::KOEventView(Calendar *cal,TQWidget *parent,const char *name) + : KOrg::BaseView(cal,parent,name) { } diff --git a/korganizer/koeventview.h b/korganizer/koeventview.h index 0a29e0c93..303486c43 100644 --- a/korganizer/koeventview.h +++ b/korganizer/koeventview.h @@ -62,10 +62,10 @@ class KOEventView : public KOrg::BaseView * Constructs a view. * @param cal is a pointer to the calendar object from which events * will be retrieved for display. - * @param tqparent is the tqparent TQWidget. + * @param parent is the parent TQWidget. * @param name is the view name. */ - KOEventView(Calendar *cal,TQWidget *tqparent=0,const char *name=0); + KOEventView(Calendar *cal,TQWidget *parent=0,const char *name=0); /** * Destructor. Views will do view-specific cleanups here. diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 2a49934a5..a9746dbe9 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -39,8 +39,8 @@ #include <tqregexp.h> #include <tqtooltip.h> -KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *tqparent, const char *name ) - : TQTextBrowser( tqparent, name ), mCalendar( calendar ), mDefaultText("") +KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *parent, const char *name ) + : TQTextBrowser( parent, name ), mCalendar( calendar ), mDefaultText("") { mIncidence = 0; connect( this, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(message(const TQString &)) ); diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 19ef3774d..e8cceb1ff 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -42,7 +42,7 @@ class KDE_EXPORT KOEventViewer : public TQTextBrowser Q_OBJECT TQ_OBJECT public: - explicit KOEventViewer( Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0 ); + explicit KOEventViewer( Calendar *calendar, TQWidget *parent = 0, const char *name = 0 ); virtual ~KOEventViewer(); /** diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index eccf2ac9e..afbe84194 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -28,9 +28,9 @@ #include <klocale.h> -KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *tqparent, +KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent, const char *name, bool compact ) - : KDialogBase( tqparent, name, false, i18n("Event Viewer"), Ok, Ok, false, + : KDialogBase( parent, name, false, i18n("Event Viewer"), Ok, Ok, false, i18n("Edit") ) { mEventViewer = new KOEventViewer( calendar, this ); diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index 147df9062..cf1bd5caa 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h @@ -43,7 +43,7 @@ class KDE_EXPORT KOEventViewerDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - explicit KOEventViewerDialog( Calendar *calendar, TQWidget *tqparent = 0, + explicit KOEventViewerDialog( Calendar *calendar, TQWidget *parent = 0, const char *name = 0, bool compact = false ); virtual ~KOEventViewerDialog(); diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index 8f41e82cd..dd22ade4b 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp @@ -154,9 +154,9 @@ TQStringList KOGlobals::holiday( const TQDate &date ) bool KOGlobals::isWorkDay( const TQDate &date ) { - int tqmask( ~( KOPrefs::instance()->mWorkWeekMask ) ); + int mask( ~( KOPrefs::instance()->mWorkWeekMask ) ); - bool nonWorkDay = ( tqmask & ( 1 << ( date.dayOfWeek() - 1 ) ) ); + bool nonWorkDay = ( mask & ( 1 << ( date.dayOfWeek() - 1 ) ) ); if ( KOPrefs::instance()->mExcludeHolidays && mHolidays ) { TQValueList<KHoliday> list = mHolidays->getHolidays( date ); TQValueList<KHoliday>::ConstIterator it = list.begin(); diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp index e5e174e48..5104383c1 100644 --- a/korganizer/kogroupware.cpp +++ b/korganizer/kogroupware.cpp @@ -238,7 +238,7 @@ class KOInvitationFormatterHelper : public InvitationFormatterHelper * Return true means accept the changes * Return false means revert the changes */ -bool KOGroupware::sendICalMessage( TQWidget* tqparent, +bool KOGroupware::sendICalMessage( TQWidget* parent, KCal::Scheduler::Method method, Incidence* incidence, KOGlobals::HowChanged action, @@ -318,7 +318,7 @@ bool KOGroupware::sendICalMessage( TQWidget* tqparent, } rc = KMessageBox::questionYesNo( - tqparent, txt, i18n( "Group Scheduling Email" ), + parent, txt, i18n( "Group Scheduling Email" ), KGuiItem( i18n( "Send Email" ) ), KGuiItem( i18n( "Do Not Send" ) ) ); } else { return true; @@ -331,14 +331,14 @@ bool KOGroupware::sendICalMessage( TQWidget* tqparent, // Ask if the user wants to tell the organizer about the current status TQString txt = i18n( "Do you want to send a status update to the " "organizer of this task?"); - rc = KMessageBox::questionYesNo( tqparent, txt, TQString(), i18n("Send Update"), i18n("Do Not Send") ); + rc = KMessageBox::questionYesNo( parent, txt, TQString(), i18n("Send Update"), i18n("Do Not Send") ); } else if( incidence->type() == "Event" ) { TQString txt; if ( attendeeStatusChanged && method == Scheduler::Request ) { txt = i18n( "Your status as an attendee of this event changed. " "Do you want to send a status update to the event organizer?" ); method = Scheduler::Reply; - rc = KMessageBox::questionYesNo( tqparent, txt, TQString(), i18n("Send Update"), i18n("Do Not Send") ); + rc = KMessageBox::questionYesNo( parent, txt, TQString(), i18n("Send Update"), i18n("Do Not Send") ); } else { if( action == KOGlobals::INCIDENCEDELETED ) { const TQStringList myEmails = KOPrefs::instance()->allEmails(); @@ -360,14 +360,14 @@ bool KOGroupware::sendICalMessage( TQWidget* tqparent, "Do you want to send an updated response to the organizer " "declining the invitation?" ); rc = KMessageBox::questionYesNo( - tqparent, txt, i18n( "Group Scheduling Email" ), + parent, txt, i18n( "Group Scheduling Email" ), KGuiItem( i18n( "Send Update" ) ), KGuiItem( i18n( "Do Not Send" ) ) ); setDoNotNotify( rc == KMessageBox::No ); } else { txt = i18n( "You are not the organizer of this event. Editing it will " "bring your calendar out of sync with the organizer's calendar. " "Do you really want to edit it?" ); - rc = KMessageBox::warningYesNo( tqparent, txt ); + rc = KMessageBox::warningYesNo( parent, txt ); return ( rc == KMessageBox::Yes ); } } diff --git a/korganizer/kogroupware.h b/korganizer/kogroupware.h index 4e74ed432..5fd801879 100644 --- a/korganizer/kogroupware.h +++ b/korganizer/kogroupware.h @@ -76,7 +76,7 @@ class KOGroupware : public TQObject Returns false if the user cancels the dialog, and true if the user presses Yes og or No. */ - bool sendICalMessage( TQWidget *tqparent, KCal::Scheduler::Method method, + bool sendICalMessage( TQWidget *parent, KCal::Scheduler::Method method, Incidence* incidence, KOGlobals::HowChanged action, bool attendeeStatusChanged, diff --git a/korganizer/koidentitymanager.h b/korganizer/koidentitymanager.h index 8fcf88117..3b0b98114 100644 --- a/korganizer/koidentitymanager.h +++ b/korganizer/koidentitymanager.h @@ -32,8 +32,8 @@ namespace KOrg { class IdentityManager : public KPIM::IdentityManager { public: - IdentityManager( TQObject * tqparent=0, const char * name=0 ) - : KPIM::IdentityManager( true /*readonly*/, tqparent, name ) {} + IdentityManager( TQObject * parent=0, const char * name=0 ) + : KPIM::IdentityManager( true /*readonly*/, parent, name ) {} protected: virtual void createDefaultIdentity( TQString& fullName, TQString& emailAddress ); diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index ec391c9ec..779064f9d 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -56,9 +56,9 @@ #include "templatemanagementdialog.h" KOIncidenceEditor::KOIncidenceEditor( const TQString &caption, - Calendar *calendar, TQWidget *tqparent ) + Calendar *calendar, TQWidget *parent ) : KDialogBase( Tabbed, caption, Ok | Apply | Cancel | Default, Ok, - tqparent, 0, false, false ), + parent, 0, false, false ), mAttendeeEditor( 0 ), mResource( 0 ), mIsCounter( false ), mIsCreateTask( false ), mRecurIncidence( 0 ), mRecurIncidenceAfterDissoc( 0 ) { diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h index 4ff8915b2..7bd185846 100644 --- a/korganizer/koincidenceeditor.h +++ b/korganizer/koincidenceeditor.h @@ -63,7 +63,7 @@ class KOIncidenceEditor : public KDialogBase Construct new IncidenceEditor. */ KOIncidenceEditor( const TQString &caption, Calendar *calendar, - TQWidget *tqparent ); + TQWidget *parent ); virtual ~KOIncidenceEditor(); /** This incidence has been modified externally */ diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp index 23bdbe8f8..30e6c7d71 100644 --- a/korganizer/kojournaleditor.cpp +++ b/korganizer/kojournaleditor.cpp @@ -43,8 +43,8 @@ using namespace KCal; -KOJournalEditor::KOJournalEditor( Calendar *calendar, TQWidget *tqparent ) : - KOIncidenceEditor( i18n("Edit Journal Entry"), calendar, tqparent ) +KOJournalEditor::KOJournalEditor( Calendar *calendar, TQWidget *parent ) : + KOIncidenceEditor( i18n("Edit Journal Entry"), calendar, parent ) { mJournal = 0; } diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h index 7f7573898..f537cae35 100644 --- a/korganizer/kojournaleditor.h +++ b/korganizer/kojournaleditor.h @@ -51,7 +51,7 @@ class KOJournalEditor : public KOIncidenceEditor /** Constructs a new Journal editor. */ - KOJournalEditor( Calendar *calendar, TQWidget *tqparent ); + KOJournalEditor( Calendar *calendar, TQWidget *parent ); virtual ~KOJournalEditor(); void init(); diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index b5742e471..1219fd57e 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -42,9 +42,9 @@ #include "koglobals.h" using namespace KOrg; -KOJournalView::KOJournalView(Calendar *calendar, TQWidget *tqparent, +KOJournalView::KOJournalView(Calendar *calendar, TQWidget *parent, const char *name) - : KOrg::BaseView(calendar, tqparent, name) + : KOrg::BaseView(calendar, parent, name) { TQVBoxLayout*topLayout = new TQVBoxLayout( this ); topLayout->setAutoAdd(true); diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h index 404c6b936..056b456ee 100644 --- a/korganizer/kojournalview.h +++ b/korganizer/kojournalview.h @@ -43,7 +43,7 @@ class KOJournalView : public KOrg::BaseView Q_OBJECT TQ_OBJECT public: - KOJournalView( Calendar *calendar, TQWidget *tqparent = 0, + KOJournalView( Calendar *calendar, TQWidget *parent = 0, const char *name = 0); ~KOJournalView(); diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 2bad209bd..32ddc327a 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -56,10 +56,10 @@ enum { }; -KOListViewToolTip::KOListViewToolTip( TQWidget* tqparent, +KOListViewToolTip::KOListViewToolTip( TQWidget* parent, Calendar *calendar, KListView *lv ) - :TQToolTip( tqparent ), mCalendar( calendar ) + :TQToolTip( parent ), mCalendar( calendar ) { eventlist = lv; } @@ -196,10 +196,10 @@ bool KOListView::ListItemVisitor::visit( Journal *j ) } KOListView::KOListView( Calendar *calendar, - TQWidget *tqparent, + TQWidget *parent, const char *name, bool nonInteractive ) - : KOEventView( calendar, tqparent, name ) + : KOEventView( calendar, parent, name ) { mActiveItem = 0; mIsNonInteractive = nonInteractive; diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index 50d0ab5cf..2480d6bef 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h @@ -44,7 +44,7 @@ class KOListView; class KOListViewToolTip : public TQToolTip { public: - KOListViewToolTip ( TQWidget* tqparent, Calendar *calendar, KListView* lv ); + KOListViewToolTip ( TQWidget* parent, Calendar *calendar, KListView* lv ); protected: void maybeTip( const TQPoint &pos ); @@ -71,7 +71,7 @@ class KOListView : public KOEventView TQ_OBJECT public: explicit KOListView( Calendar *calendar, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0, bool nonInteractive = false ); ~KOListView(); diff --git a/korganizer/komessagebox.cpp b/korganizer/komessagebox.cpp index dbc1e8afd..6a0100aad 100644 --- a/korganizer/komessagebox.cpp +++ b/korganizer/komessagebox.cpp @@ -28,12 +28,12 @@ #include "komessagebox.h" -int KOMessageBox::fourBtnMsgBox( TQWidget *tqparent, TQMessageBox::Icon type, +int KOMessageBox::fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &text, const TQString &caption, const KGuiItem &button1, const KGuiItem &button2, const KGuiItem &button3, int options) { - KDialogBase *dialog= new KDialogBase( tqparent, "KOMessageBox", true, + KDialogBase *dialog= new KDialogBase( parent, "KOMessageBox", true, caption.isEmpty() ? "" : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Yes, diff --git a/korganizer/komessagebox.h b/korganizer/komessagebox.h index 1ddfa88c2..2335fce77 100644 --- a/korganizer/komessagebox.h +++ b/korganizer/komessagebox.h @@ -33,7 +33,7 @@ class KOMessageBox { public: - static int fourBtnMsgBox( TQWidget *tqparent, TQMessageBox::Icon type, + static int fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &text, const TQString &caption = TQString(), const KGuiItem &button1 = KStdGuiItem::yes(), const KGuiItem &button2 = KStdGuiItem::no(), const KGuiItem &button3 = KStdGuiItem::cont(), diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 5ed6664f0..eead72522 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -61,11 +61,11 @@ //-------------------------------------------------------------------------- -KOMonthCellToolTip::KOMonthCellToolTip( TQWidget *tqparent, +KOMonthCellToolTip::KOMonthCellToolTip( TQWidget *parent, Calendar *calendar, const TQDate &date, KNoScrollListBox *lv ) - : TQToolTip( tqparent ), mCalendar( calendar ), mDate( date ) + : TQToolTip( parent ), mCalendar( calendar ), mDate( date ) { eventlist = lv; } @@ -87,8 +87,8 @@ void KOMonthCellToolTip::maybeTip( const TQPoint &pos ) } } -KNoScrollListBox::KNoScrollListBox( TQWidget *tqparent, const char *name ) - : TQListBox( tqparent, name ), +KNoScrollListBox::KNoScrollListBox( TQWidget *parent, const char *name ) + : TQListBox( parent, name ), mSqueezing( false ) { TQPalette pal = palette(); @@ -378,9 +378,9 @@ int MonthViewItem::width( const TQListBox *lb ) const } -MonthViewCell::MonthViewCell( KOMonthView *tqparent) - : TQWidget( tqparent ), - mMonthView( tqparent ), mPrimary( false ), mHoliday( false ), +MonthViewCell::MonthViewCell( KOMonthView *parent) + : TQWidget( parent ), + mMonthView( parent ), mPrimary( false ), mHoliday( false ), isSelected( false ) { TQVBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -810,8 +810,8 @@ void MonthViewCell::contextMenu( TQListBoxItem *item ) } -KOMonthView::KOMonthView( Calendar *calendar, TQWidget *tqparent, const char *name ) - : KOEventView( calendar, tqparent, name ), +KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name ) + : KOEventView( calendar, parent, name ), mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) { diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 7a988559a..732a63a1a 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -36,7 +36,7 @@ class KNoScrollListBox; class KOMonthCellToolTip : public TQToolTip { public: - KOMonthCellToolTip (TQWidget* tqparent, Calendar *calendar, const TQDate &date, KNoScrollListBox* lv ); + KOMonthCellToolTip (TQWidget* parent, Calendar *calendar, const TQDate &date, KNoScrollListBox* lv ); protected: void maybeTip( const TQPoint & pos); @@ -53,7 +53,7 @@ class KNoScrollListBox: public TQListBox Q_OBJECT TQ_OBJECT public: - KNoScrollListBox(TQWidget *tqparent=0, const char *name=0); + KNoScrollListBox(TQWidget *parent=0, const char *name=0); ~KNoScrollListBox() {} void setBackground( bool primary, bool workday ); @@ -145,7 +145,7 @@ class MonthViewCell : public TQWidget /** @return Date of cell */ TQDate date() const; - /** @return MonthView tqparent */ + /** @return MonthView parent */ KOMonthView *monthView() { return mMonthView; } /** @@ -247,7 +247,7 @@ class KOMonthView: public KOEventView Q_OBJECT TQ_OBJECT public: - KOMonthView(Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 ); + KOMonthView(Calendar *cal, TQWidget *parent = 0, const char *name = 0 ); ~KOMonthView(); /** Returns maximum number of days supported by the komonthview */ diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 35b67fed9..6ceadd8f5 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -80,8 +80,8 @@ #include <kdepimmacros.h> -KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *tqparent, const char *name ) - : KPrefsModule( KOPrefs::instance(), tqparent, name ) +KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) + : KPrefsModule( KOPrefs::instance(), parent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -138,9 +138,9 @@ void KOPrefsDialogMain::toggleEmailSettings( bool on ) extern "C" { - KDE_EXPORT KCModule *create_korganizerconfigmain( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_korganizerconfigmain( TQWidget *parent, const char * ) { - return new KOPrefsDialogMain( tqparent, "kcmkorganizermain" ); + return new KOPrefsDialogMain( parent, "kcmkorganizermain" ); } } @@ -148,8 +148,8 @@ extern "C" class KOPrefsDialogTime : public KPrefsModule { public: - KOPrefsDialogTime( TQWidget *tqparent, const char *name ) - : KPrefsModule( KOPrefs::instance(), tqparent, name ) + KOPrefsDialogTime( TQWidget *parent, const char *name ) + : KPrefsModule( KOPrefs::instance(), parent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -442,11 +442,11 @@ class KOPrefsDialogTime : public KPrefsModule KOPrefs::instance()->mReminderTime = mReminderTimeSpin->value(); KOPrefs::instance()->mReminderTimeUnits = mReminderUnitsCombo->currentItem(); - int tqmask = 0; + int mask = 0; for ( int i = 0; i < 7; ++i ) { - if (mWorkDays[i]->isChecked()) tqmask = tqmask | (1<<i); + if (mWorkDays[i]->isChecked()) mask = mask | (1<<i); } - KOPrefs::instance()->mWorkWeekMask = tqmask; + KOPrefs::instance()->mWorkWeekMask = mask; KOPrefs::instance()->writeConfig(); } @@ -479,10 +479,10 @@ class KOPrefsDialogTime : public KPrefsModule extern "C" { - KCModule *create_korganizerconfigtime( TQWidget *tqparent, const char * ) + KCModule *create_korganizerconfigtime( TQWidget *parent, const char * ) { KGlobal::locale()->insertCatalogue( "timezones" ); - return new KOPrefsDialogTime( tqparent, "kcmkorganizertime" ); + return new KOPrefsDialogTime( parent, "kcmkorganizertime" ); } } @@ -490,8 +490,8 @@ extern "C" class KOPrefsDialogViews : public KPrefsModule { public: - KOPrefsDialogViews( TQWidget *tqparent, const char *name ) - : KPrefsModule( KOPrefs::instance(), tqparent, name ) + KOPrefsDialogViews( TQWidget *parent, const char *name ) + : KPrefsModule( KOPrefs::instance(), parent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -579,9 +579,9 @@ class KOPrefsDialogViews : public KPrefsModule extern "C" { - KCModule *create_korganizerconfigviews( TQWidget *tqparent, const char * ) + KCModule *create_korganizerconfigviews( TQWidget *parent, const char * ) { - return new KOPrefsDialogViews( tqparent, "kcmkorganizerviews" ); + return new KOPrefsDialogViews( parent, "kcmkorganizerviews" ); } } @@ -589,8 +589,8 @@ extern "C" class KOPrefsDialogFonts : public KPrefsModule { public: - KOPrefsDialogFonts( TQWidget *tqparent, const char *name ) - : KPrefsModule( KOPrefs::instance(), tqparent, name ) + KOPrefsDialogFonts( TQWidget *parent, const char *name ) + : KPrefsModule( KOPrefs::instance(), parent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -639,15 +639,15 @@ class KOPrefsDialogFonts : public KPrefsModule extern "C" { - KCModule *create_korganizerconfigfonts( TQWidget *tqparent, const char * ) + KCModule *create_korganizerconfigfonts( TQWidget *parent, const char * ) { - return new KOPrefsDialogFonts( tqparent, "kcmkorganizerfonts" ); + return new KOPrefsDialogFonts( parent, "kcmkorganizerfonts" ); } } -KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *tqparent, const char *name ) - : KPrefsModule( KOPrefs::instance(), tqparent, name ) +KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) + : KPrefsModule( KOPrefs::instance(), parent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -842,15 +842,15 @@ void KOPrefsDialogColors::updateResourceColor() } extern "C" { - KCModule *create_korganizerconfigcolors( TQWidget *tqparent, const char * ) + KCModule *create_korganizerconfigcolors( TQWidget *parent, const char * ) { - return new KOPrefsDialogColors( tqparent, "kcmkorganizercolors" ); + return new KOPrefsDialogColors( parent, "kcmkorganizercolors" ); } } -KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *tqparent, const char *name ) - : KPrefsModule( KOPrefs::instance(), tqparent, name ) +KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, const char *name ) + : KPrefsModule( KOPrefs::instance(), parent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -1005,17 +1005,17 @@ void KOPrefsDialogGroupScheduling::updateInput() extern "C" { - KCModule *create_korganizerconfiggroupscheduling( TQWidget *tqparent, + KCModule *create_korganizerconfiggroupscheduling( TQWidget *parent, const char * ) { - return new KOPrefsDialogGroupScheduling( tqparent, + return new KOPrefsDialogGroupScheduling( parent, "kcmkorganizergroupscheduling" ); } } -KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *tqparent, const char *name ) - : KPrefsModule( KOPrefs::instance(), tqparent, name ) +KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *parent, const char *name ) + : KPrefsModule( KOPrefs::instance(), parent, name ) { mGroupwarePage = new KOGroupwarePrefsPage( this ); connect( mGroupwarePage, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) ); @@ -1069,9 +1069,9 @@ void KOPrefsDialogGroupwareScheduling::usrWriteConfig() extern "C" { - KCModule *create_korganizerconfigfreebusy( TQWidget *tqparent, const char * ) + KCModule *create_korganizerconfigfreebusy( TQWidget *parent, const char * ) { - return new KOPrefsDialogGroupwareScheduling( tqparent, + return new KOPrefsDialogGroupwareScheduling( parent, "kcmkorganizerfreebusy" ); } } @@ -1080,8 +1080,8 @@ extern "C" class PluginItem : public TQCheckListItem { public: - PluginItem( TQListView *tqparent, KService::Ptr service ) : - TQCheckListItem( tqparent, service->name(), TQCheckListItem::CheckBox ), mService( service ) + PluginItem( TQListView *parent, KService::Ptr service ) : + TQCheckListItem( parent, service->name(), TQCheckListItem::CheckBox ), mService( service ) {} KService::Ptr service() { return mService; } private: @@ -1092,8 +1092,8 @@ class PluginItem : public TQCheckListItem { /** Dialog for selecting and configuring KOrganizer plugins */ -KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *tqparent, const char* name ) - : KPrefsModule( KOPrefs::instance(), tqparent, name ) +KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name ) + : KPrefsModule( KOPrefs::instance(), parent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -1210,9 +1210,9 @@ void KOPrefsDialogPlugins::selectionChanged( TQListViewItem *i ) extern "C" { - KCModule *create_korganizerconfigplugins( TQWidget *tqparent, const char * ) + KCModule *create_korganizerconfigplugins( TQWidget *parent, const char * ) { - return new KOPrefsDialogPlugins( tqparent, + return new KOPrefsDialogPlugins( parent, "kcmkorganizerplugins" ); } } @@ -1220,13 +1220,13 @@ extern "C" extern "C" { - KCModule *create_korgdesignerfields( TQWidget *tqparent, const char * ) { - return new KOPrefsDesignerFields( tqparent, "kcmkorgdesignerfields" ); + KCModule *create_korgdesignerfields( TQWidget *parent, const char * ) { + return new KOPrefsDesignerFields( parent, "kcmkorgdesignerfields" ); } } -KOPrefsDesignerFields::KOPrefsDesignerFields( TQWidget *tqparent, const char *name ) - : KCMDesignerFields( tqparent, name ) +KOPrefsDesignerFields::KOPrefsDesignerFields( TQWidget *parent, const char *name ) + : KCMDesignerFields( parent, name ) { } diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index c50b5f370..b3da40c7a 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h @@ -43,7 +43,7 @@ class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule Q_OBJECT TQ_OBJECT public: - KOPrefsDialogMain( TQWidget *tqparent, const char *name ); + KOPrefsDialogMain( TQWidget *parent, const char *name ); protected slots: void toggleEmailSettings( bool on ); @@ -56,7 +56,7 @@ class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule Q_OBJECT TQ_OBJECT public: - KOPrefsDialogColors( TQWidget *tqparent, const char *name ); + KOPrefsDialogColors( TQWidget *parent, const char *name ); protected: void usrWriteConfig(); @@ -87,7 +87,7 @@ class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule Q_OBJECT TQ_OBJECT public: - KOPrefsDialogGroupScheduling( TQWidget *tqparent, const char *name ); + KOPrefsDialogGroupScheduling( TQWidget *parent, const char *name ); protected: void usrReadConfig(); @@ -111,7 +111,7 @@ class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule Q_OBJECT TQ_OBJECT public: - KOPrefsDialogGroupwareScheduling( TQWidget *tqparent, const char *name ); + KOPrefsDialogGroupwareScheduling( TQWidget *parent, const char *name ); protected: void usrReadConfig(); @@ -126,7 +126,7 @@ class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule Q_OBJECT TQ_OBJECT public: - KOPrefsDialogPlugins( TQWidget *tqparent, const char *name ); + KOPrefsDialogPlugins( TQWidget *parent, const char *name ); protected slots: void usrReadConfig(); @@ -144,7 +144,7 @@ class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule class KDE_EXPORT KOPrefsDesignerFields : public KPIM::KCMDesignerFields { public: - KOPrefsDesignerFields( TQWidget *tqparent = 0, const char *name = 0 ); + KOPrefsDesignerFields( TQWidget *parent = 0, const char *name = 0 ); protected: TQString localUiDir(); diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index f629a15a7..d539d6676 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -65,8 +65,8 @@ static int defSuspendUnit = 0; // 0=>minutes, 1=>hours, 2=>days, 3=>weeks class AlarmListItem : public KListViewItem { public: - AlarmListItem( const TQString &uid, TQListView *tqparent ) - : KListViewItem( tqparent ), mUid( uid ), mNotified( false ) + AlarmListItem( const TQString &uid, TQListView *parent ) + : KListViewItem( parent ), mUid( uid ), mNotified( false ) { } @@ -96,10 +96,10 @@ int AlarmListItem::compare( TQListViewItem *item, int iCol, bool bAscending ) co typedef TQValueList<AlarmListItem*> ItemList; -AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *tqparent, const char *name ) +AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, const char *name ) : KDialogBase( Plain, WType_TopLevel | WStyle_Customize | WStyle_StaysOnTop | WStyle_DialogBorder, - tqparent, name, false, i18n("Reminder"), + parent, name, false, i18n("Reminder"), Ok | User1 | User2 | User3, NoDefault, false, i18n("Edit..."), i18n("Dismiss All"), i18n("Dismiss Reminder") ), mCalendar( calendar ), mSuspendTimer(this) diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h index e82832fad..b47f64d14 100644 --- a/korganizer/korgac/alarmdialog.h +++ b/korganizer/korgac/alarmdialog.h @@ -46,7 +46,7 @@ class AlarmDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - explicit AlarmDialog( CalendarResources *calendar, TQWidget *tqparent = 0, const char *name = 0 ); + explicit AlarmDialog( CalendarResources *calendar, TQWidget *parent = 0, const char *name = 0 ); ~AlarmDialog(); diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index f0837c65d..ac9b96c89 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -39,8 +39,8 @@ #include <tqpushbutton.h> -KOAlarmClient::KOAlarmClient( TQObject *tqparent, const char *name ) - : DCOPObject( "ac" ), TQObject( tqparent, name ), mDialog( 0 ) +KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) + : DCOPObject( "ac" ), TQObject( parent, name ), mDialog( 0 ) { kdDebug(5890) << "KOAlarmClient::KOAlarmClient()" << endl; @@ -116,8 +116,8 @@ void KOAlarmClient::checkAlarms() TQValueList<Alarm *>::ConstIterator it; for( it = alarms.begin(); it != alarms.end(); ++it ) { - kdDebug(5891) << "REMINDER: " << (*it)->tqparent()->summary() << endl; - Incidence *incidence = mCalendar->incidence( (*it)->tqparent()->uid() ); + kdDebug(5891) << "REMINDER: " << (*it)->parent()->summary() << endl; + Incidence *incidence = mCalendar->incidence( (*it)->parent()->uid() ); createReminder( mCalendar, incidence, from, (*it)->text() ); } } @@ -201,7 +201,7 @@ TQStringList KOAlarmClient::dumpAlarms() TQValueList<Alarm*>::ConstIterator it; for( it = alarms.begin(); it != alarms.end(); ++it ) { Alarm *a = *it; - lst << TQString(" ") + a->tqparent()->summary() + " (" + lst << TQString(" ") + a->parent()->summary() + " (" + a->time().toString() + ")"; } diff --git a/korganizer/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h index b1b8c189c..93e1f31c4 100644 --- a/korganizer/korgac/koalarmclient.h +++ b/korganizer/korgac/koalarmclient.h @@ -46,7 +46,7 @@ class KOAlarmClient : public TQObject, virtual public AlarmClientIface, public K Q_OBJECT TQ_OBJECT public: - KOAlarmClient( TQObject *tqparent = 0, const char *name = 0 ); + KOAlarmClient( TQObject *parent = 0, const char *name = 0 ); ~KOAlarmClient(); bool commitData( TQSessionManager & ); diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index 4d2382917..00360480b 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -67,9 +67,9 @@ typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory; K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory ) KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList & ) : - KParts::ReadOnlyPart(tqparent, name), mTopLevelWidget( parentWidget->tqtopLevelWidget() ) + KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->tqtopLevelWidget() ) { KGlobal::locale()->insertCatalogue( "libkcal" ); KGlobal::locale()->insertCatalogue( "libkdepim" ); diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index a20485f29..923a153d5 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -60,7 +60,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart, TQ_OBJECT public: KOrganizerPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList & ); + TQObject *parent, const char *name, const TQStringList & ); virtual ~KOrganizerPart(); static KAboutData *createAboutData(); diff --git a/korganizer/korganizerifaceimpl.cpp b/korganizer/korganizerifaceimpl.cpp index 9ec8b26cf..a7d29ad28 100644 --- a/korganizer/korganizerifaceimpl.cpp +++ b/korganizer/korganizerifaceimpl.cpp @@ -35,8 +35,8 @@ KOrganizerIfaceImpl::KOrganizerIfaceImpl( ActionManager* actionManager, - TQObject* tqparent, const char* name ) - : DCOPObject( "KOrganizerIface" ), TQObject( tqparent, name ), + TQObject* parent, const char* name ) + : DCOPObject( "KOrganizerIface" ), TQObject( parent, name ), mActionManager( actionManager ) { } diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h index 4ecddcb05..1d81ac0d5 100644 --- a/korganizer/korganizerifaceimpl.h +++ b/korganizer/korganizerifaceimpl.h @@ -42,7 +42,7 @@ class ActionManager; class KDE_EXPORT KOrganizerIfaceImpl : public TQObject, virtual public KOrganizerIface { public: KOrganizerIfaceImpl( ActionManager* mActionManager, - TQObject* tqparent=0, const char* name=0 ); + TQObject* parent=0, const char* name=0 ); ~KOrganizerIfaceImpl(); bool openURL( const TQString &url ); diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp index 072ea31f2..84c9d746c 100644 --- a/korganizer/kotimelineview.cpp +++ b/korganizer/kotimelineview.cpp @@ -41,9 +41,9 @@ using namespace KOrg; using namespace KCal; -KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *tqparent, +KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *parent, const char *name) - : KOEventView(calendar, tqparent, name), + : KOEventView(calendar, parent, name), mEventPopup( 0 ) { TQVBoxLayout* vbox = new TQVBoxLayout(this); @@ -340,8 +340,8 @@ void KOTimelineView::itemMoved(KDGanttViewItem * item) if ( duration < 0 ) duration = 0; } i->setDuration( duration ); - TimelineItem *tqparent = static_cast<TimelineItem*>( tlit->tqparent() ); - tqparent->moveItems( i, tlit->originalStart().secsTo( newStart ), duration + allDayOffset ); + TimelineItem *parent = static_cast<TimelineItem*>( tlit->parent() ); + parent->moveItems( i, tlit->originalStart().secsTo( newStart ), duration + allDayOffset ); mChanger->endChange( i, 0, TQString() ); } diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h index 36907e6b1..9442a32d5 100644 --- a/korganizer/kotimelineview.h +++ b/korganizer/kotimelineview.h @@ -46,7 +46,7 @@ class KOTimelineView : public KOEventView Q_OBJECT TQ_OBJECT public: - KOTimelineView(Calendar *calendar, TQWidget *tqparent = 0, + KOTimelineView(Calendar *calendar, TQWidget *parent = 0, const char *name = 0); ~KOTimelineView(); diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 8da491fb4..c3eee2ee4 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -51,8 +51,8 @@ #include "kotodoeditor.h" #include "kocore.h" -KOTodoEditor::KOTodoEditor( Calendar *calendar, TQWidget *tqparent ) : - KOIncidenceEditor( TQString(), calendar, tqparent ), +KOTodoEditor::KOTodoEditor( Calendar *calendar, TQWidget *parent ) : + KOIncidenceEditor( TQString(), calendar, parent ), mTodo( 0 ), mCalendar( 0 ), mRelatedTodo( 0 ), mGeneral( 0 ), mRecurrence( 0 ) { } @@ -257,7 +257,7 @@ void KOTodoEditor::setDates( const TQDateTime &due, bool allDay, Todo *relatedEv { mRelatedTodo = relatedEvent; - // inherit some properties from tqparent todo + // inherit some properties from parent todo if ( mRelatedTodo ) { mGeneral->setCategories( mRelatedTodo->categories() ); } @@ -306,7 +306,7 @@ void KOTodoEditor::writeTodo( Todo *todo ) } writeDesignerFields( todo ); - // set related incidence, i.e. tqparent to-do in this case. + // set related incidence, i.e. parent to-do in this case. if ( mRelatedTodo ) { todo->setRelatedTo( mRelatedTodo ); } diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h index 5322714f2..bf31f3699 100644 --- a/korganizer/kotodoeditor.h +++ b/korganizer/kotodoeditor.h @@ -42,7 +42,7 @@ class KOTodoEditor : public KOIncidenceEditor /** Constructs a new todo editor. */ - KOTodoEditor( Calendar *calendar, TQWidget *tqparent ); + KOTodoEditor( Calendar *calendar, TQWidget *parent ); virtual ~KOTodoEditor(); void init(); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index ecd680541..73a9d126e 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -64,10 +64,10 @@ using namespace KOrg; #include "calprinter.h" #endif -KOTodoListViewToolTip::KOTodoListViewToolTip (TQWidget *tqparent, +KOTodoListViewToolTip::KOTodoListViewToolTip (TQWidget *parent, Calendar *calendar, KOTodoListView *lv ) - :TQToolTip(tqparent), mCalendar( calendar ) + :TQToolTip(parent), mCalendar( calendar ) { todolist=lv; } @@ -100,8 +100,8 @@ void KOTodoListViewToolTip::maybeTip( const TQPoint & pos) -KOTodoListView::KOTodoListView( TQWidget *tqparent, const char *name ) - : KListView( tqparent, name ), mCalendar( 0 ), mChanger( 0 ) +KOTodoListView::KOTodoListView( TQWidget *parent, const char *name ) + : KListView( parent, name ), mCalendar( 0 ), mChanger( 0 ) { mOldCurrent = 0; mMousePressed = false; @@ -227,7 +227,7 @@ void KOTodoListView::contentsDropEvent( TQDropEvent *e ) mChanger->changeIncidence( oldTodo, existingTodo, KOGlobals::RELATION_MODIFIED, this ); mChanger->endChange( existingTodo, 0, TQString() ); } else { - KMessageBox::sorry( this, i18n("Unable to change to-do's tqparent, " + KMessageBox::sorry( this, i18n("Unable to change to-do's parent, " "because the to-do cannot be locked.") ); } delete oldTodo; @@ -360,8 +360,8 @@ void KOTodoListView::contentsMouseDoubleClickEvent(TQMouseEvent *e) ///////////////////////////////////////////////////////////////////////////// -KOTodoView::KOTodoView( Calendar *calendar, TQWidget *tqparent, const char* name) - : KOrg::BaseView( calendar, tqparent, name ) +KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name) + : KOrg::BaseView( calendar, parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -558,7 +558,7 @@ void KOTodoView::updateView() */ // Put for each Event a KOTodoViewItem in the list view. Don't rely on a - // specific order of events. That means that we have to generate tqparent items + // specific order of events. That means that we have to generate parent items // recursively for proper hierarchical display of Todos. mTodoMap.clear(); Todo::List::ConstIterator it; @@ -612,7 +612,7 @@ TQMap<Todo *,KOTodoViewItem *>::ConstIterator // and one into the map. Sure finding is more easy but why? -zecke KOTodoViewItem *todoItem; - // in case we found a related tqparent, which has no KOTodoViewItem yet, this must + // in case we found a related parent, which has no KOTodoViewItem yet, this must // be the case where 2 items refer to each other, therefore simply create item as root item if ( *itemIterator == 0 ) { todo->setRelatedTo(0); // break the recursion, else we will have troubles later @@ -703,12 +703,12 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action) scheduleRemoveTodoItem( todoItem ); } else { // correctly update changes in relations - Todo*tqparent = dynamic_cast<Todo*>( todo->relatedTo() ); + Todo*parent = dynamic_cast<Todo*>( todo->relatedTo() ); KOTodoViewItem*parentItem = 0; - if ( tqparent && mTodoMap.contains(tqparent) ) { - parentItem = mTodoMap[ tqparent ]; + if ( parent && mTodoMap.contains(parent) ) { + parentItem = mTodoMap[ parent ]; } - if ( todoItem->tqparent() != parentItem ) { + if ( todoItem->parent() != parentItem ) { // The relations changed if ( parentItem ) { parentItem->insertItem( todoItem ); diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 03a41b9fe..6175a053a 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -58,7 +58,7 @@ using namespace KOrg; class KOTodoListViewToolTip : public TQToolTip { public: - KOTodoListViewToolTip( TQWidget *tqparent, Calendar *calendar, KOTodoListView *lv ); + KOTodoListViewToolTip( TQWidget *parent, Calendar *calendar, KOTodoListView *lv ); protected: void maybeTip( const TQPoint &pos ); @@ -74,7 +74,7 @@ class KOTodoListView : public KListView Q_OBJECT TQ_OBJECT public: - KOTodoListView( TQWidget *tqparent = 0, const char *name = 0 ); + KOTodoListView( TQWidget *parent = 0, const char *name = 0 ); ~KOTodoListView(); void setCalendar( Calendar * ); @@ -115,7 +115,7 @@ class KOTodoView : public KOrg::BaseView Q_OBJECT TQ_OBJECT public: - KOTodoView( Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 ); + KOTodoView( Calendar *cal, TQWidget *parent = 0, const char *name = 0 ); ~KOTodoView(); void setCalendar( Calendar * ); diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 02369d91a..3fe929b64 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -38,14 +38,14 @@ #include <tqpainter.h> -KOTodoViewItem::KOTodoViewItem( TQListView *tqparent, Todo *todo, KOTodoView *kotodo) - : TQCheckListItem( tqparent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo ) +KOTodoViewItem::KOTodoViewItem( TQListView *parent, Todo *todo, KOTodoView *kotodo) + : TQCheckListItem( parent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo ) { construct(); } -KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *tqparent, Todo *todo, KOTodoView *kotodo ) - : TQCheckListItem( tqparent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo ) +KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo ) + : TQCheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo ) { construct(); } @@ -151,7 +151,7 @@ void KOTodoViewItem::construct() setText( KOTodoView::eDueDateColumn, dtStr ); mEffectiveDueDate = mTodo->dtDue(); KOTodoViewItem *myParent; - if ( ( myParent = dynamic_cast<KOTodoViewItem *>( tqparent() ) ) ) + if ( ( myParent = dynamic_cast<KOTodoViewItem *>( parent() ) ) ) if ( !myParent->mEffectiveDueDate.isValid() || myParent->mEffectiveDueDate > mEffectiveDueDate ) { myParent->mEffectiveDueDate = mEffectiveDueDate; @@ -213,12 +213,12 @@ bool KOTodoViewItem::isAlternate() { KOTodoViewItem *item; bool previous = true; - if (TQListViewItem::tqparent()) + if (TQListViewItem::parent()) { - item = dynamic_cast<KOTodoViewItem *>(TQListViewItem::tqparent()); + item = dynamic_cast<KOTodoViewItem *>(TQListViewItem::parent()); if (item) previous = item->m_odd; - item = dynamic_cast<KOTodoViewItem *>(TQListViewItem::tqparent()->firstChild()); + item = dynamic_cast<KOTodoViewItem *>(TQListViewItem::parent()->firstChild()); } else { diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h index 9f7032f89..d2e679757 100644 --- a/korganizer/kotodoviewitem.h +++ b/korganizer/kotodoviewitem.h @@ -51,12 +51,12 @@ class KOTodoViewItem : public TQCheckListItem /** Constructor. - @param tqparent is the list view to which this item belongs. + @param parent is the list view to which this item belongs. @param todo is the todo to have the item display information for. @param kotodo is a pointer to the KOTodoView object. */ - KOTodoViewItem(TQListView *tqparent, Todo *todo, KOTodoView *kotodo); - KOTodoViewItem(KOTodoViewItem *tqparent, Todo *todo, KOTodoView *kotodo); + KOTodoViewItem(TQListView *parent, Todo *todo, KOTodoView *kotodo); + KOTodoViewItem(KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo); virtual ~KOTodoViewItem() {} void construct(); diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index e04e0c9a9..38ab086af 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -354,12 +354,12 @@ void KOViewManager::showAgendaView() const bool showSideBySide = !isLocalFile && ( showBoth || mode == KOPrefs::CalendarsSideBySide ); - TQWidget *tqparent = mMainView->viewStack(); + TQWidget *parent = mMainView->viewStack(); if ( !mAgendaViewTabs && showBoth ) { mAgendaViewTabs = new TQTabWidget( mMainView->viewStack() ); connect( mAgendaViewTabs, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, TQT_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) ); - tqparent = mAgendaViewTabs; + parent = mAgendaViewTabs; KConfig *config = KOGlobals::self()->config(); config->setGroup( "Views" ); @@ -369,7 +369,7 @@ void KOViewManager::showAgendaView() if ( !mAgendaView && showMerged ) { mAgendaView = new KOAgendaView( mMainView->calendar(), mMainView, - tqparent, + parent, "KOViewManager::AgendaView" ); addView(mAgendaView); @@ -386,7 +386,7 @@ void KOViewManager::showAgendaView() if ( !mAgendaSideBySideView && showSideBySide ) { mAgendaSideBySideView = - new MultiAgendaView( mMainView->calendar(), mMainView, tqparent, + new MultiAgendaView( mMainView->calendar(), mMainView, parent, "KOViewManager::AgendaSideBySideView" ); addView(mAgendaSideBySideView); diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 14e2f80aa..a698edfe1 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -60,9 +60,9 @@ void WhatsNextTextBrowser::setSource(const TQString& n) } } -KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *tqparent, +KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent, const char *name) - : KOrg::BaseView(calendar, tqparent, name) + : KOrg::BaseView(calendar, parent, name) { // TQLabel *dateLabel = // new TQLabel(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()),this); diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h index 7fd07aeb7..e899ae157 100644 --- a/korganizer/kowhatsnextview.h +++ b/korganizer/kowhatsnextview.h @@ -36,7 +36,7 @@ class WhatsNextTextBrowser : public TQTextBrowser { Q_OBJECT TQ_OBJECT public: - WhatsNextTextBrowser(TQWidget *tqparent) : TQTextBrowser(tqparent) {} + WhatsNextTextBrowser(TQWidget *parent) : TQTextBrowser(parent) {} void setSource(const TQString &); @@ -53,7 +53,7 @@ class KOWhatsNextView : public KOrg::BaseView Q_OBJECT TQ_OBJECT public: - KOWhatsNextView(Calendar *calendar, TQWidget *tqparent = 0, + KOWhatsNextView(Calendar *calendar, TQWidget *parent = 0, const char *name = 0); ~KOWhatsNextView(); diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index 4b7da9e26..8558d846f 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -41,8 +41,8 @@ for(TQValueList<KOAgendaView*>::ConstIterator it = mAgendaViews.constBegin(); \ using namespace KOrg; MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView, - TQWidget * tqparent, const char *name ) : - AgendaView( cal, tqparent, name ), + TQWidget * parent, const char *name ) : + AgendaView( cal, parent, name ), mSelectedAgendaView( 0 ), mLastMovedSplitter( 0 ), mUpdateOnShow( false ), @@ -464,12 +464,12 @@ bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event) if ( (event->type() == TQEvent::MouseMove && KGlobalSettings::opaqueResize()) || event->type() == TQEvent::MouseButtonRelease ) { FOREACH_VIEW( agenda ) { - if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->tqparent()) ) + if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->parent()) ) mLastMovedSplitter = agenda->splitter(); } - if ( TQT_BASE_OBJECT(mLeftSplitter )== TQT_BASE_OBJECT(obj->tqparent()) ) + if ( TQT_BASE_OBJECT(mLeftSplitter )== TQT_BASE_OBJECT(obj->parent()) ) mLastMovedSplitter = mLeftSplitter; - else if ( TQT_BASE_OBJECT(mRightSplitter) == TQT_BASE_OBJECT(obj->tqparent()) ) + else if ( TQT_BASE_OBJECT(mRightSplitter) == TQT_BASE_OBJECT(obj->parent()) ) mLastMovedSplitter = mRightSplitter; TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) ); } diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h index c25f3903b..06c219dc5 100644 --- a/korganizer/multiagendaview.h +++ b/korganizer/multiagendaview.h @@ -44,7 +44,7 @@ class MultiAgendaView : public AgendaView TQ_OBJECT public: explicit MultiAgendaView( Calendar* cal, CalendarView *calendarView, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~MultiAgendaView(); KOAgendaView *selectedAgendaView(); diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 342d6bb49..23a017167 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -42,8 +42,8 @@ #include "navigatorbar.h" -ActiveLabel::ActiveLabel( TQWidget *tqparent, const char *name ) - : TQLabel( tqparent, name ) +ActiveLabel::ActiveLabel( TQWidget *parent, const char *name ) + : TQLabel( parent, name ) { } @@ -53,8 +53,8 @@ void ActiveLabel::mouseReleaseEvent( TQMouseEvent * ) } -NavigatorBar::NavigatorBar( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mHasMinWidth( false ) +NavigatorBar::NavigatorBar( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mHasMinWidth( false ) { TQFont tfont = font(); tfont.setPointSize( 10 ); diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h index 19cda40a5..d3642b0a2 100644 --- a/korganizer/navigatorbar.h +++ b/korganizer/navigatorbar.h @@ -36,7 +36,7 @@ class ActiveLabel : public TQLabel Q_OBJECT TQ_OBJECT public: - ActiveLabel( TQWidget *tqparent, const char *name = 0 ); + ActiveLabel( TQWidget *parent, const char *name = 0 ); signals: void clicked(); @@ -51,7 +51,7 @@ class NavigatorBar: public TQWidget Q_OBJECT TQ_OBJECT public: - NavigatorBar( TQWidget *tqparent = 0, const char *name = 0 ); + NavigatorBar( TQWidget *parent = 0, const char *name = 0 ); ~NavigatorBar(); void showButtons( bool left, bool right ); diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp index 6f5c4d86a..3766e2ffd 100644 --- a/korganizer/plugins/datenums/configdialog.cpp +++ b/korganizer/plugins/datenums/configdialog.cpp @@ -34,8 +34,8 @@ #include "configdialog.h" #include "configdialog.moc" -ConfigDialog::ConfigDialog(TQWidget *tqparent) - : KDialogBase(Plain,i18n("Configure Day Numbers"),Ok|Cancel,Ok,tqparent) +ConfigDialog::ConfigDialog(TQWidget *parent) + : KDialogBase(Plain,i18n("Configure Day Numbers"),Ok|Cancel,Ok,parent) { TQFrame *topFrame = plainPage(); TQVBoxLayout *topLayout = new TQVBoxLayout(topFrame,0,spacingHint()); diff --git a/korganizer/plugins/datenums/configdialog.h b/korganizer/plugins/datenums/configdialog.h index f7291bd42..df2b7594e 100644 --- a/korganizer/plugins/datenums/configdialog.h +++ b/korganizer/plugins/datenums/configdialog.h @@ -28,7 +28,7 @@ class ConfigDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ConfigDialog(TQWidget *tqparent=0); + ConfigDialog(TQWidget *parent=0); virtual ~ConfigDialog(); protected: diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp index 32fc953e7..b0a25ce4a 100644 --- a/korganizer/plugins/datenums/datenums.cpp +++ b/korganizer/plugins/datenums/datenums.cpp @@ -40,9 +40,9 @@ Datenums::Datenums() mDateNum = config.readNumEntry( "ShowDayNumbers", 0 ); } -void Datenums::configure(TQWidget *tqparent) +void Datenums::configure(TQWidget *parent) { - ConfigDialog *dlg = new ConfigDialog(tqparent); + ConfigDialog *dlg = new ConfigDialog(parent); dlg->exec(); delete dlg; } diff --git a/korganizer/plugins/datenums/datenums.h b/korganizer/plugins/datenums/datenums.h index c15b04ebd..f9ca7783a 100644 --- a/korganizer/plugins/datenums/datenums.h +++ b/korganizer/plugins/datenums/datenums.h @@ -30,7 +30,7 @@ class Datenums : public CalendarDecoration { Datenums(); ~Datenums() {} - void configure(TQWidget *tqparent); + void configure(TQWidget *parent); TQString shortText(const TQDate &); TQString info(); diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index f2aaa33e5..87784c282 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -46,18 +46,18 @@ using namespace KCal; // Needed for connecting slots class ExchangeFactory : public KOrg::PartFactory { public: - KOrg::Part *create(KOrg::MainWindow *tqparent, const char *name) + KOrg::Part *create(KOrg::MainWindow *parent, const char *name) { kdDebug(5850) << "Registering Exchange Plugin...\n"; KGlobal::locale()->insertCatalogue("libkpimexchange"); - return new Exchange(tqparent,name); + return new Exchange(parent,name); } }; K_EXPORT_COMPONENT_FACTORY( libkorg_exchange, ExchangeFactory ) -Exchange::Exchange(KOrg::MainWindow *tqparent, const char *name) : - KOrg::Part(tqparent,name) +Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : + KOrg::Part(parent,name) { setInstance( new KInstance( "korganizer" ) ); @@ -65,7 +65,7 @@ Exchange::Exchange(KOrg::MainWindow *tqparent, const char *name) : mAccount = new KPIM::ExchangeAccount( "Calendar/Exchange Plugin" ); mClient = new KPIM::ExchangeClient( mAccount ); - mClient->setWindow( tqparent->tqtopLevelWidget() ); + mClient->setWindow( parent->tqtopLevelWidget() ); setXMLFile("plugins/exchangeui.rc"); diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp index 76e6abe7d..fe01324ac 100644 --- a/korganizer/plugins/exchange/exchangeconfig.cpp +++ b/korganizer/plugins/exchange/exchangeconfig.cpp @@ -31,8 +31,8 @@ #include "exchangeconfig.h" -ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* tqparent ) - : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,tqparent) +ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent ) + : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,parent) { mAccount = account; diff --git a/korganizer/plugins/exchange/exchangeconfig.h b/korganizer/plugins/exchange/exchangeconfig.h index 095f73cd1..54692f846 100644 --- a/korganizer/plugins/exchange/exchangeconfig.h +++ b/korganizer/plugins/exchange/exchangeconfig.h @@ -32,7 +32,7 @@ class ExchangeConfig : public KDialogBase Q_OBJECT TQ_OBJECT public: - ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *tqparent=0); + ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *parent=0); virtual ~ExchangeConfig(); // protected: diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp index 8c5cb74f2..de56a3a19 100644 --- a/korganizer/plugins/exchange/exchangedialog.cpp +++ b/korganizer/plugins/exchange/exchangedialog.cpp @@ -30,8 +30,8 @@ #include "exchangedialog.h" -ExchangeDialog::ExchangeDialog( const TQDate &_start, const TQDate &_end, TQWidget *tqparent) - : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,tqparent) +ExchangeDialog::ExchangeDialog( const TQDate &_start, const TQDate &_end, TQWidget *parent) + : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,parent) { TQFrame *topFrame = plainPage(); TQGridLayout *topLayout = new TQGridLayout( topFrame, 2, 2, 3 ); diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h index 1aa17c38f..80fe46f7a 100644 --- a/korganizer/plugins/exchange/exchangedialog.h +++ b/korganizer/plugins/exchange/exchangedialog.h @@ -29,7 +29,7 @@ class ExchangeDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *tqparent=0); + ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *parent=0); virtual ~ExchangeDialog(); protected slots: diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index ee74a5777..6298151ac 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/korganizer/plugins/hebrew/configdialog.cpp @@ -26,8 +26,8 @@ #include <kstandarddirs.h> #include <ksimpleconfig.h> -ConfigDialog::ConfigDialog(TQWidget * tqparent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok, - tqparent) +ConfigDialog::ConfigDialog(TQWidget * parent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok, + parent) { TQFrame *topFrame = plainPage(); TQVBoxLayout *topLayout = diff --git a/korganizer/plugins/hebrew/configdialog.h b/korganizer/plugins/hebrew/configdialog.h index 1ef1153f7..cfd19e7fd 100644 --- a/korganizer/plugins/hebrew/configdialog.h +++ b/korganizer/plugins/hebrew/configdialog.h @@ -32,7 +32,7 @@ class ConfigDialog:public KDialogBase public: - ConfigDialog(TQWidget * tqparent = 0); + ConfigDialog(TQWidget * parent = 0); virtual ~ ConfigDialog(); protected: diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index 240e9a3f7..e36925aa5 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -103,9 +103,9 @@ TQString Hebrew::info() i18n("This plugin provides the date in the Jewish calendar."); } -void Hebrew::configure(TQWidget * tqparent) +void Hebrew::configure(TQWidget * parent) { - ConfigDialog *dlg = new ConfigDialog(tqparent); //tqparent? + ConfigDialog *dlg = new ConfigDialog(parent); //parent? dlg->exec(); delete dlg; diff --git a/korganizer/plugins/hebrew/hebrew.h b/korganizer/plugins/hebrew/hebrew.h index 80507fad4..c337f7ef4 100644 --- a/korganizer/plugins/hebrew/hebrew.h +++ b/korganizer/plugins/hebrew/hebrew.h @@ -34,7 +34,7 @@ public: ~Hebrew() { } - void configure(TQWidget * tqparent); + void configure(TQWidget * parent); TQString shortText(const TQDate &); TQString info(); diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index 3c7678e1a..79b146b35 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -64,9 +64,9 @@ Todo *KOProjectViewItem::event() } -KOProjectView::KOProjectView(Calendar *calendar,TQWidget* tqparent, +KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent, const char* name) : - KOrg::BaseView(calendar,tqparent,name) + KOrg::BaseView(calendar,parent,name) { TQBoxLayout *topLayout = new TQVBoxLayout(this); @@ -183,7 +183,7 @@ void KOProjectView::updateView() */ // Put for each Event a KOProjectViewItem in the list view. Don't rely on a - // specific order of events. That means that we have to generate tqparent items + // specific order of events. That means that we have to generate parent items // recursively for proper hierarchical display of Todos. mTodoMap.clear(); Todo::List::ConstIterator it; @@ -216,7 +216,7 @@ TQMap<Todo *,KGanttItem *>::ConstIterator } } -KGanttItem *KOProjectView::createTask(KGanttItem *tqparent,Todo *todo) +KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo) { TQDateTime startDt; TQDateTime endDt; @@ -237,7 +237,7 @@ KGanttItem *KOProjectView::createTask(KGanttItem *tqparent,Todo *todo) endDt = todo->dtDue(); } - KGanttItem *task = new KOProjectViewItem(todo,tqparent,todo->summary(),startDt, + KGanttItem *task = new KOProjectViewItem(todo,parent,todo->summary(),startDt, endDt); connect(task,TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), TQT_SLOT(taskChanged(KGanttItem*,KGanttItem::Change))); diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h index 21aa4b2b0..d05610527 100644 --- a/korganizer/plugins/projectview/koprojectview.h +++ b/korganizer/plugins/projectview/koprojectview.h @@ -68,7 +68,7 @@ class KOProjectView : public KOrg::BaseView Q_OBJECT TQ_OBJECT public: - KOProjectView(Calendar *, TQWidget* tqparent=0, const char* name=0 ); + KOProjectView(Calendar *, TQWidget* parent=0, const char* name=0 ); ~KOProjectView() {} Incidence::List selectedIncidences(); diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index d6a009c8e..2e7b3dc61 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -35,18 +35,18 @@ using namespace KOrg; class ProjectViewFactory : public KOrg::PartFactory { public: - KOrg::Part *create(KOrg::MainWindow *tqparent, const char *name) + KOrg::Part *create(KOrg::MainWindow *parent, const char *name) { KGlobal::locale()->insertCatalogue( "kgantt" ); - return new ProjectView(tqparent,name); + return new ProjectView(parent,name); } }; K_EXPORT_COMPONENT_FACTORY( libkorg_projectview, ProjectViewFactory ) -ProjectView::ProjectView(KOrg::MainWindow *tqparent, const char *name) : - KOrg::Part(tqparent,name), mView(0) +ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) : + KOrg::Part(parent,name), mView(0) { setInstance( new KInstance( "korganizer" ) ); diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp index 7f70f12ea..08fd51b16 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/korganizer/plugins/timespanview/kotimespanview.cpp @@ -35,9 +35,9 @@ #include "kotimespanview.h" #include "kotimespanview.moc" -KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *tqparent, +KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *parent, const char *name) : - KOEventView( calendar, tqparent, name ) + KOEventView( calendar, parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h index f0d6c6cef..c121d8970 100644 --- a/korganizer/plugins/timespanview/kotimespanview.h +++ b/korganizer/plugins/timespanview/kotimespanview.h @@ -34,7 +34,7 @@ class KOTimeSpanView : public KOEventView Q_OBJECT TQ_OBJECT public: - KOTimeSpanView( Calendar *calendar, TQWidget *tqparent = 0, + KOTimeSpanView( Calendar *calendar, TQWidget *parent = 0, const char *name = 0 ); ~KOTimeSpanView(); diff --git a/korganizer/plugins/timespanview/lineview.cpp b/korganizer/plugins/timespanview/lineview.cpp index fe337f4eb..cf8ccd804 100644 --- a/korganizer/plugins/timespanview/lineview.cpp +++ b/korganizer/plugins/timespanview/lineview.cpp @@ -31,8 +31,8 @@ #include "lineview.h" #include "lineview.moc" -LineView::LineView( TQWidget *tqparent, const char *name ) : - TQScrollView( tqparent, name ) +LineView::LineView( TQWidget *parent, const char *name ) : + TQScrollView( parent, name ) { mPixelWidth = 1000; diff --git a/korganizer/plugins/timespanview/lineview.h b/korganizer/plugins/timespanview/lineview.h index df028cdb9..e0b5c906f 100644 --- a/korganizer/plugins/timespanview/lineview.h +++ b/korganizer/plugins/timespanview/lineview.h @@ -32,7 +32,7 @@ class LineView : public TQScrollView Q_OBJECT TQ_OBJECT public: - LineView( TQWidget *tqparent = 0, const char *name = 0 ); + LineView( TQWidget *parent = 0, const char *name = 0 ); virtual ~LineView(); int pixelWidth(); diff --git a/korganizer/plugins/timespanview/timeline.cpp b/korganizer/plugins/timespanview/timeline.cpp index 513701cd7..e402294bb 100644 --- a/korganizer/plugins/timespanview/timeline.cpp +++ b/korganizer/plugins/timespanview/timeline.cpp @@ -29,8 +29,8 @@ #include "timeline.h" #include "timeline.moc" -TimeLine::TimeLine( TQWidget *tqparent, const char *name ) : - TQScrollView( tqparent, name ) +TimeLine::TimeLine( TQWidget *parent, const char *name ) : + TQScrollView( parent, name ) { mPixelWidth = 1000; diff --git a/korganizer/plugins/timespanview/timeline.h b/korganizer/plugins/timespanview/timeline.h index d7718928d..74d0a3cf5 100644 --- a/korganizer/plugins/timespanview/timeline.h +++ b/korganizer/plugins/timespanview/timeline.h @@ -32,7 +32,7 @@ class TimeLine : public TQScrollView Q_OBJECT TQ_OBJECT public: - TimeLine( TQWidget *tqparent = 0, const char *name = 0 ); + TimeLine( TQWidget *parent = 0, const char *name = 0 ); virtual ~TimeLine(); void setDateRange( const TQDateTime &start, const TQDateTime &end ); diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index 3f9e2ee57..24a45abb1 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -35,17 +35,17 @@ using namespace KOrg; class TimespanViewFactory : public KOrg::PartFactory { public: - KOrg::Part *create( KOrg::MainWindow *tqparent, const char *name ) + KOrg::Part *create( KOrg::MainWindow *parent, const char *name ) { - return new TimespanView( tqparent, name ); + return new TimespanView( parent, name ); } }; K_EXPORT_COMPONENT_FACTORY( libkorg_timespanview, TimespanViewFactory ) -TimespanView::TimespanView(KOrg::MainWindow *tqparent, const char *name) : - KOrg::Part(tqparent,name), mView(0) +TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) : + KOrg::Part(parent,name), mView(0) { setInstance( new KInstance( "korganizer" ) ); diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp index e208c0881..b1c156ee5 100644 --- a/korganizer/plugins/timespanview/timespanwidget.cpp +++ b/korganizer/plugins/timespanview/timespanwidget.cpp @@ -39,8 +39,8 @@ #include "timespanwidget.h" #include "timespanwidget.moc" -TimeSpanWidget::TimeSpanWidget( TQWidget *tqparent, const char *name ) : - TQWidget( tqparent, name ) +TimeSpanWidget::TimeSpanWidget( TQWidget *parent, const char *name ) : + TQWidget( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/korganizer/plugins/timespanview/timespanwidget.h b/korganizer/plugins/timespanview/timespanwidget.h index 103efc5f7..92a2f116a 100644 --- a/korganizer/plugins/timespanview/timespanwidget.h +++ b/korganizer/plugins/timespanview/timespanwidget.h @@ -40,7 +40,7 @@ class TimeSpanWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - TimeSpanWidget( TQWidget *tqparent=0, const char *name=0 ); + TimeSpanWidget( TQWidget *parent=0, const char *name=0 ); virtual ~TimeSpanWidget(); void addItem( KCal::Event * ); diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp index 8a7c83a36..23671bd92 100644 --- a/korganizer/previewdialog.cpp +++ b/korganizer/previewdialog.cpp @@ -49,8 +49,8 @@ using namespace KCal; -PreviewDialog::PreviewDialog( const KURL &url, TQWidget *tqparent ) - : KDialogBase( Plain, i18n("Import Calendar/Event"), User1 | User2 | Cancel, User1, tqparent, +PreviewDialog::PreviewDialog( const KURL &url, TQWidget *parent ) + : KDialogBase( Plain, i18n("Import Calendar/Event"), User1 | User2 | Cancel, User1, parent, 0, true, true, KGuiItem( i18n("&Merge into existing calendar"), "merge" ) ), mOriginalUrl( url ) { diff --git a/korganizer/previewdialog.h b/korganizer/previewdialog.h index 16d430890..c495e9bb7 100644 --- a/korganizer/previewdialog.h +++ b/korganizer/previewdialog.h @@ -43,7 +43,7 @@ class PreviewDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - PreviewDialog( const KURL &url, TQWidget *tqparent ); + PreviewDialog( const KURL &url, TQWidget *parent ); ~PreviewDialog(); bool loadCalendar(); diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index 4097f1ed7..c990dccd5 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -46,10 +46,10 @@ #include "calprintdefaultplugins.h" -CalPrinter::CalPrinter( TQWidget *tqparent, Calendar *calendar, KOrg::CoreHelper *helper ) - : TQObject( tqparent, "CalPrinter" ) +CalPrinter::CalPrinter( TQWidget *parent, Calendar *calendar, KOrg::CoreHelper *helper ) + : TQObject( parent, "CalPrinter" ) { - mParent = tqparent; + mParent = parent; mConfig = new KSimpleConfig( "korganizer_printing.rc" ); mCoreHelper = helper; @@ -168,8 +168,8 @@ void CalPrinter::updateConfig() /****************************************************************************/ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, - TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, /*modal*/true, i18n("Print"), Ok | Cancel ) + TQWidget *parent, const char *name ) + : KDialogBase( parent, name, /*modal*/true, i18n("Print"), Ok | Cancel ) { TQVBox *page = makeVBoxMainWidget(); diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h index f3e2ad2d5..7a0f257ba 100644 --- a/korganizer/printing/calprinter.h +++ b/korganizer/printing/calprinter.h @@ -64,7 +64,7 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase }; public: /** - \param par tqparent widget for dialogs + \param par parent widget for dialogs \param cal calendar to be printed \param helper is a pointer to the KOrg::CoreHelper object */ @@ -110,7 +110,7 @@ class CalPrintDialog : public KDialogBase TQ_OBJECT public: CalPrintDialog( KOrg::PrintPlugin::List plugins, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); virtual ~CalPrintDialog(); KOrg::PrintPlugin *selectedPlugin(); void setOrientation( CalPrinter::ePrintOrientation orientation ); diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 63eb25f83..27c3cb336 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -1427,7 +1427,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, TQRect rect; TodoParentStart startpt; - // This list keeps all starting points of the tqparent to-dos so the connection + // This list keeps all starting points of the parent to-dos so the connection // lines of the tree can easily be drawn (needed if a new page is started) static TQPtrList<TodoParentStart> startPoints; if ( level < 1 ) { @@ -1450,7 +1450,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, } // if too big make new page if ( rect.bottom() > pageHeight ) { - // first draw the connection lines from tqparent to-dos: + // first draw the connection lines from parent to-dos: if ( level > 0 && connectSubTodos ) { TodoParentStart *rct; for ( rct = startPoints.first(); rct; rct = startPoints.next() ) { @@ -1458,7 +1458,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, int center = rct->mRect.left() + (rct->mRect.width()/2); int to = p.viewport().bottom(); - // draw either from start point of tqparent or from top of the page + // draw either from start point of parent or from top of the page if ( rct->mSamePage ) start = rct->mRect.bottom() + 1; else @@ -1473,7 +1473,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, } // If this is a sub-to-do, r will not be 0, and we want the LH side - // of the priority line up to the RH side of the tqparent to-do's priority + // of the priority line up to the RH side of the parent to-do's priority bool showPriority = posPriority>=0; int lhs = posPriority; if ( r ) { diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h index 385949622..592151946 100644 --- a/korganizer/printing/calprintpluginbase.h +++ b/korganizer/printing/calprintpluginbase.h @@ -478,7 +478,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin \param p TQPainter of the printout \param sortField Specifies on which attribute of the todo you want to sort. \param sortDir Specifies if you want to sort ascending or descending. - \param connectSubTodos Whether sub-to-dos shall be connected with their tqparent by a line (tree-like). + \param connectSubTodos Whether sub-to-dos shall be connected with their parent by a line (tree-like). \param strikeoutCompleted Whether completed to-dos should be printed with strike-out summaries. \param desc Whether to print the whole description of the to-do (the summary is always printed). \param posPriority x-coordinate where the priority is supposed to be printed. If <0, no priority will be printed. @@ -491,7 +491,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin \param width width of the whole to-do list. \param pageHeight Total height allowed for the to-do list on a page. If an to-do would be below that line, a new page is started. \param todoList Contains a list of sub-todos for the specified @p todo . - \param r Internal (used when printing sub-to-dos to give information about its tqparent) + \param r Internal (used when printing sub-to-dos to give information about its parent) */ void drawTodo( int &count, Todo *todo, TQPainter &p, TodoSortField sortField, SortDirection sortDir, diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index 63509d355..f5592335b 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -383,7 +383,7 @@ <cstring>mConnectSubTodos</cstring> </property> <property name="text"> - <string>Co&nnect sub-to-dos with its tqparent</string> + <string>Co&nnect sub-to-dos with its parent</string> </property> <property name="checked"> <bool>true</bool> diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp index 33e30e9ba..5d8b3462e 100644 --- a/korganizer/publishdialog.cpp +++ b/korganizer/publishdialog.cpp @@ -37,9 +37,9 @@ #include "publishdialog.h" #include "publishdialog_base.h" -PublishDialog::PublishDialog( TQWidget* tqparent, const char* name, +PublishDialog::PublishDialog( TQWidget* parent, const char* name, bool modal ) - : KDialogBase( tqparent, name, modal, + : KDialogBase( parent, name, modal, i18n("Select Addresses"), Ok|Cancel|Help, Ok, true ) { mWidget = new PublishDialog_base( this, "PublishFreeBusy" ); diff --git a/korganizer/publishdialog.h b/korganizer/publishdialog.h index 832816005..5ef4b9a95 100644 --- a/korganizer/publishdialog.h +++ b/korganizer/publishdialog.h @@ -36,7 +36,7 @@ class PublishDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - PublishDialog(TQWidget* tqparent=0,const char* name=0, + PublishDialog(TQWidget* parent=0,const char* name=0, bool modal=true ); ~PublishDialog(); diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index 9058df869..a4475a4c2 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -96,9 +96,9 @@ ResourceViewFactory::ResourceViewFactory( CalendarResources *calendar, CalendarV { } -CalendarViewExtension *ResourceViewFactory::create( TQWidget *tqparent ) +CalendarViewExtension *ResourceViewFactory::create( TQWidget *parent ) { - mResourceView = new ResourceView( mCalendar, mCalendarView, tqparent ); + mResourceView = new ResourceView( mCalendar, mCalendarView, parent ); TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ), mCalendarView, TQT_SLOT( resourcesChanged() ) ); @@ -127,8 +127,8 @@ ResourceView *ResourceViewFactory::resourceView() const } ResourceItem::ResourceItem( ResourceCalendar *resource, ResourceView *view, - KListView *tqparent ) - : TQCheckListItem( tqparent, resource->resourceName(), CheckBox ), + KListView *parent ) + : TQCheckListItem( parent, resource->resourceName(), CheckBox ), mResource( resource ), mResourceView( view ), mBlockStateChange( false ), mIsSubresource( false ), mResourceIdentifier( TQString() ), mSubItemsCreated( false ), mIsStandardResource( false ) @@ -164,8 +164,8 @@ void ResourceItem::createSubresourceItems() } ResourceItem::ResourceItem( ResourceCalendar *resource, const TQString &identifier, - const TQString &label, ResourceView *view, ResourceItem *tqparent ) - : TQCheckListItem( tqparent, label, CheckBox ), mResource( resource ), + const TQString &label, ResourceView *view, ResourceItem *parent ) + : TQCheckListItem( parent, label, CheckBox ), mResource( resource ), mResourceView( view ), mBlockStateChange( false ), mIsSubresource( true ), mSubItemsCreated( false ), mIsStandardResource( false ) { @@ -258,8 +258,8 @@ void ResourceItem::paintCell(TQPainter *p, const TQColorGroup &cg, ResourceView::ResourceView( CalendarResources *calendar, - CalendarView *view, TQWidget *tqparent, const char *name ) - : CalendarViewExtension( tqparent, name ), mCalendar( calendar ), mCalendarView( view ) + CalendarView *view, TQWidget *parent, const char *name ) + : CalendarViewExtension( parent, name ), mCalendar( calendar ), mCalendarView( view ) { TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h index 39606a53e..e5bb9d3e6 100644 --- a/korganizer/resourceview.h +++ b/korganizer/resourceview.h @@ -57,9 +57,9 @@ class ResourceViewFactory : public CalendarViewExtension::Factory class ResourceItem : public TQCheckListItem { public: - ResourceItem( ResourceCalendar *resource, ResourceView *view, KListView *tqparent ); + ResourceItem( ResourceCalendar *resource, ResourceView *view, KListView *parent ); ResourceItem( ResourceCalendar *resource, const TQString &identifier, - const TQString &label, ResourceView *view, ResourceItem *tqparent ); + const TQString &label, ResourceView *view, ResourceItem *parent ); ResourceCalendar *resource() { return mResource; } const TQString& resourceIdentifier() { return mResourceIdentifier; } @@ -98,7 +98,7 @@ class ResourceView : public CalendarViewExtension TQ_OBJECT public: ResourceView( CalendarResources *calendar, CalendarView *view, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~ResourceView(); CalendarResources *calendar() const { return mCalendar; } diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index a5a11134a..8e0800830 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -45,8 +45,8 @@ #include "searchdialog.h" #include "searchdialog.moc" -SearchDialog::SearchDialog(Calendar *calendar,TQWidget *tqparent) - : KDialogBase(Plain,i18n("Find Events"),User1|Close,User1,tqparent,0,false,false, +SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) + : KDialogBase(Plain,i18n("Find Events"),User1|Close,User1,parent,0,false,false, KGuiItem( i18n("&Find"), "find") ) { mCalendar = calendar; diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h index 33427c258..f2a1f40fa 100644 --- a/korganizer/searchdialog.h +++ b/korganizer/searchdialog.h @@ -48,7 +48,7 @@ class SearchDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - SearchDialog(Calendar *calendar,TQWidget *tqparent=0); + SearchDialog(Calendar *calendar,TQWidget *parent=0); virtual ~SearchDialog(); void updateView(); diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp index a90ab28d3..39e23a8d6 100644 --- a/korganizer/statusdialog.cpp +++ b/korganizer/statusdialog.cpp @@ -35,8 +35,8 @@ #include "statusdialog.h" #include "statusdialog.moc" -StatusDialog::StatusDialog(TQWidget* tqparent, const char* name) : - KDialog(tqparent,name,true) +StatusDialog::StatusDialog(TQWidget* parent, const char* name) : + KDialog(parent,name,true) { setCaption(i18n("Set Your tqStatus")); diff --git a/korganizer/statusdialog.h b/korganizer/statusdialog.h index 6c1b90f2d..9f01bca6e 100644 --- a/korganizer/statusdialog.h +++ b/korganizer/statusdialog.h @@ -31,7 +31,7 @@ class StatusDialog : public KDialog Q_OBJECT TQ_OBJECT public: - StatusDialog(TQWidget* tqparent=0,const char* name=0); + StatusDialog(TQWidget* parent=0,const char* name=0); ~StatusDialog(); Attendee::PartStat status(); diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp index f610a2fd1..bbee8ca80 100644 --- a/korganizer/templatemanagementdialog.cpp +++ b/korganizer/templatemanagementdialog.cpp @@ -45,8 +45,8 @@ #include <klocale.h> #include <kmessagebox.h> -TemplateManagementDialog::TemplateManagementDialog(TQWidget *tqparent, const TQStringList &templates ) - :KDialogBase( tqparent, "template_management_dialog", true, +TemplateManagementDialog::TemplateManagementDialog(TQWidget *parent, const TQStringList &templates ) + :KDialogBase( parent, "template_management_dialog", true, i18n("Manage Templates"), Ok|Cancel, Ok, true , i18n("Apply Template")), m_templates( templates ), m_newTemplate( TQString() ), m_changed( false ) { diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h index 0a8fadf08..d3f2afd23 100644 --- a/korganizer/templatemanagementdialog.h +++ b/korganizer/templatemanagementdialog.h @@ -48,7 +48,7 @@ class TemplateManagementDialog: public KDialogBase { Q_OBJECT TQ_OBJECT public: - TemplateManagementDialog( TQWidget *tqparent, const TQStringList& templates ); + TemplateManagementDialog( TQWidget *parent, const TQStringList& templates ); signals: /* Emitted whenever the user hits apply, indicating that the currently selected template diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp index 29291a0ae..c2802acb3 100644 --- a/korganizer/timelabels.cpp +++ b/korganizer/timelabels.cpp @@ -42,8 +42,8 @@ #include "koprefs.h" #include "koagenda.h" -TimeLabels::TimeLabels(int rows,TQWidget *tqparent,const char *name,WFlags f) : - TQScrollView(tqparent,name,f) +TimeLabels::TimeLabels(int rows,TQWidget *parent,const char *name,WFlags f) : + TQScrollView(parent,name,f) { mRows = rows; mMiniWidth = 0; diff --git a/korganizer/timelabels.h b/korganizer/timelabels.h index df555ab59..60353e374 100644 --- a/korganizer/timelabels.h +++ b/korganizer/timelabels.h @@ -41,7 +41,7 @@ class TimeLabels : public TQScrollView Q_OBJECT TQ_OBJECT public: - TimeLabels( int rows, TQWidget *tqparent = 0, const char *name = 0, + TimeLabels( int rows, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); /** Calculates the minimum width */ diff --git a/korganizer/timelineitem.cpp b/korganizer/timelineitem.cpp index 649bcfa86..1e6e11692 100644 --- a/korganizer/timelineitem.cpp +++ b/korganizer/timelineitem.cpp @@ -31,8 +31,8 @@ using namespace KOrg; using namespace KCal; -TimelineItem::TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView * tqparent) : - KDGanttViewTaskItem( tqparent ), mCalendar( calendar ) +TimelineItem::TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView * parent) : + KDGanttViewTaskItem( parent ), mCalendar( calendar ) { setListViewText( 0, label ); setDisplaySubitemsAsGroup( true ); @@ -92,8 +92,8 @@ void TimelineItem::moveItems(KCal::Incidence * incidence, int delta, int duratio TimelineSubItem::TimelineSubItem( KCal::Calendar *calendar, - KCal::Incidence *incidence, TimelineItem *tqparent) : - KDGanttViewTaskItem( tqparent ), + KCal::Incidence *incidence, TimelineItem *parent) : + KDGanttViewTaskItem( parent ), mIncidence( incidence ), mLeft( 0 ), mRight( 0 ), diff --git a/korganizer/timelineitem.h b/korganizer/timelineitem.h index 7cf451450..a3406f115 100644 --- a/korganizer/timelineitem.h +++ b/korganizer/timelineitem.h @@ -42,7 +42,7 @@ class TimelineSubItem; class TimelineItem : public KDGanttViewTaskItem { public: - TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView* tqparent ); + TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView* parent ); void insertIncidence( KCal::Incidence *incidence, const TQDateTime &start = TQDateTime(), @@ -59,7 +59,7 @@ class TimelineItem : public KDGanttViewTaskItem class TimelineSubItem : public KDGanttViewTaskItem { public: - TimelineSubItem( KCal::Calendar *calendar, KCal::Incidence *incidence, TimelineItem *tqparent ); + TimelineSubItem( KCal::Calendar *calendar, KCal::Incidence *incidence, TimelineItem *parent ); ~TimelineSubItem(); KCal::Incidence* incidence() const { return mIncidence; } diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp index a9eb31ba9..080ecd8d6 100644 --- a/korganizer/urihandler.cpp +++ b/korganizer/urihandler.cpp @@ -69,7 +69,7 @@ TQString UriHandler::uidFromUri( const TQString &uri ) return tmp; } -bool UriHandler::process( TQWidget *tqparent, const TQString &uri ) +bool UriHandler::process( TQWidget *parent, const TQString &uri ) { kdDebug(5850) << "UriHandler::process(): " << uri << endl; @@ -127,7 +127,7 @@ bool UriHandler::process( TQWidget *tqparent, const TQString &uri ) } else if ( uri.startsWith( "ATTACH:" ) ) { // a calendar incidence attachment - return AttachmentHandler::view( tqparent, attachmentNameFromUri( uri ), uidFromUri( uri ) ); + return AttachmentHandler::view( parent, attachmentNameFromUri( uri ), uidFromUri( uri ) ); } else { // no special URI, let KDE handle it new KRun( KURL( uri ) ); diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h index 360e58e3a..aa3c6de28 100644 --- a/korganizer/urihandler.h +++ b/korganizer/urihandler.h @@ -35,7 +35,7 @@ class KDE_EXPORT UriHandler /** Process URI. Return true if handler handled the URI, otherwise false. */ - static bool process( TQWidget *tqparent, const TQString &uri ); + static bool process( TQWidget *parent, const TQString &uri ); static TQString attachmentNameFromUri( const TQString &uri ); static TQString uidFromUri( const TQString &uri ); diff --git a/korn/account_input.cpp b/korn/account_input.cpp index c7b35228e..7603e56b2 100644 --- a/korn/account_input.cpp +++ b/korn/account_input.cpp @@ -44,11 +44,11 @@ TQString AccountInput::configName() const return *_configName; } -TextInput::TextInput( TQWidget *tqparent, const TQString& title, Type type, const TQString& defaul, const TQString& configName ) +TextInput::TextInput( TQWidget *parent, const TQString& title, Type type, const TQString& defaul, const TQString& configName ) : AccountInput( configName ) { - _left = new TQLabel( title, tqparent, "label" ); - _right = new KLineEdit( "", tqparent, "edit" ); + _left = new TQLabel( title, parent, "label" ); + _right = new KLineEdit( "", parent, "edit" ); switch( type ) { case text: @@ -60,11 +60,11 @@ TextInput::TextInput( TQWidget *tqparent, const TQString& title, Type type, cons setValue( defaul ); } -TextInput::TextInput( TQWidget *tqparent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName ) +TextInput::TextInput( TQWidget *parent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName ) : AccountInput( configName ) { - _left = new TQLabel( title, tqparent, "label" ); - _right = new KLineEdit( "", tqparent, "edit" ); + _left = new TQLabel( title, parent, "label" ); + _right = new KLineEdit( "", parent, "edit" ); _right->setValidator( new TQIntValidator( min, max, TQT_TQOBJECT(_right), "validator" ) ); setValue( defaul ); } @@ -85,11 +85,11 @@ void TextInput::setValue( const TQString& value ) return _right->setText( value ); } -URLInput::URLInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName ) +URLInput::URLInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName ) : AccountInput( configName ) { - _left = new TQLabel( title, tqparent, "label" ); - _right = new KURLRequester( "", tqparent, "kurledit" ); + _left = new TQLabel( title, parent, "label" ); + _right = new KURLRequester( "", parent, "kurledit" ); setValue( defaul ); } @@ -109,13 +109,13 @@ void URLInput::setValue( const TQString& value ) _right->setURL( value ); } -ComboInput::ComboInput( TQWidget *tqparent, const TQString& title, const TQMap<TQString, TQString>& list, +ComboInput::ComboInput( TQWidget *parent, const TQString& title, const TQMap<TQString, TQString>& list, const TQString& defaul, const TQString& configName ) : AccountInput( configName ) , _list( new TQMap< TQString, TQString >( list ) ) { - _left = new TQLabel( title, tqparent, "label" ); - _right = new TQComboBox( false, tqparent, "combo" ); + _left = new TQLabel( title, parent, "label" ); + _right = new TQComboBox( false, parent, "combo" ); _right->insertStringList( TQStringList( _list->values() ) ); setValue( defaul ); } @@ -142,10 +142,10 @@ void ComboInput::setValue( const TQString& value ) _right->setCurrentItem( -1 ); } -CheckboxInput::CheckboxInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName ) +CheckboxInput::CheckboxInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName ) : AccountInput( configName ) { - _right = new TQCheckBox( title, tqparent, "checkbox" ); + _right = new TQCheckBox( title, parent, "checkbox" ); setValue( defaul ); } diff --git a/korn/account_input.h b/korn/account_input.h index 8cff757ce..548db498b 100644 --- a/korn/account_input.h +++ b/korn/account_input.h @@ -106,24 +106,24 @@ public: /** * Constructor * - * @param tqparent The tqparent widget + * @param parent The parent widget * @param title The title that appears on the screen * @param type The type of TextEdit which is used * @param defaul The default value of this object * @param configName The name it has in the configuration box. */ - TextInput( TQWidget *tqparent, const TQString& title, Type type, const TQString& defaul, const TQString& configName ); + TextInput( TQWidget *parent, const TQString& title, Type type, const TQString& defaul, const TQString& configName ); /** * Constructor. Use this one if you want to ensure a number is inserted. * - * @param tqparent The tqparent widget + * @param parent The parent widget * @param title The title that appears on the screen * @param min The minimum value that can be inserted * @param max The maximum value that can be inserted * @param defaul The default value of this object * @param configName The name it has in the configuration box. */ - TextInput( TQWidget *tqparent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName ); + TextInput( TQWidget *parent, const TQString& title, int min, int max, const TQString& defaul, const TQString& configName ); /** * Destructor */ @@ -163,12 +163,12 @@ class URLInput : public AccountInput public: /** * Constructor - * @param tqparent The tqparent of this object + * @param parent The parent of this object * @param title The title of the label next to the URL. * @param defaul The default value * @param configName The name of the configuration entry */ - URLInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName ); + URLInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName ); /** * Destructor */ @@ -210,14 +210,14 @@ public: /** * Constructor * - * @param tqparent The tqparent of the widgets which are created + * @param parent The parent of the widgets which are created * @param title The title next to the combo box * @param list A mapping which maps a value in the configuration to a (translated) entry in the * combo box. * @param default The default value of the combo box. * @param configName The name in which the option is saved. */ - ComboInput( TQWidget *tqparent, const TQString& title, const TQMap<TQString,TQString>& list, + ComboInput( TQWidget *parent, const TQString& title, const TQMap<TQString,TQString>& list, const TQString& defaul, const TQString& configName ); /** * Destructor @@ -264,12 +264,12 @@ public: /** * Constructor * - * @param tqparent The tqparent for the objects which are created + * @param parent The parent for the objects which are created * @param title The title of the checkbox * @param defaul The default value ("true" for checked, "false" otherwise") * @param configName The name of the configuration entry of this object */ - CheckboxInput( TQWidget *tqparent, const TQString& title, const TQString& defaul, const TQString& configName ); + CheckboxInput( TQWidget *parent, const TQString& title, const TQString& defaul, const TQString& configName ); /** * Destructor */ diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp index fec63a2b2..ddadf7c23 100644 --- a/korn/accountmanager.cpp +++ b/korn/accountmanager.cpp @@ -34,8 +34,8 @@ KornSubjectsDlg* AccountManager::_subjectsDlg = 0; -AccountManager::AccountManager( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +AccountManager::AccountManager( TQObject * parent, const char * name ) + : TQObject( parent, name ), _kioList( new TQPtrList< KMailDrop > ), _dcopList( new TQPtrList< DCOPDrop > ), _dropInfo( new TQMap< KMailDrop*, Dropinfo* > ) diff --git a/korn/accountmanager.h b/korn/accountmanager.h index 27c4cd079..3c0c652d1 100644 --- a/korn/accountmanager.h +++ b/korn/accountmanager.h @@ -45,7 +45,7 @@ public: /** * Constructor, parameters are directed to TQObject. */ - AccountManager( TQObject * tqparent = 0, const char * name = 0 ); + AccountManager( TQObject * parent = 0, const char * name = 0 ); /** * Destructor diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp index 4f8312177..72719812d 100644 --- a/korn/boxcontainer.cpp +++ b/korn/boxcontainer.cpp @@ -24,8 +24,8 @@ #include <tqptrlist.h> -BoxContainer::BoxContainer( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +BoxContainer::BoxContainer( TQObject * parent, const char * name ) + : TQObject( parent, name ), _items( new TQPtrList< BoxContainerItem > ) { _items->setAutoDelete( true ); diff --git a/korn/boxcontainer.h b/korn/boxcontainer.h index 33e1c63d6..3f5a54e05 100644 --- a/korn/boxcontainer.h +++ b/korn/boxcontainer.h @@ -38,10 +38,10 @@ public: /** * Constructor: everything is passed to TQObject. * - * @param tqparent The tqparent of this object + * @param parent The parent of this object * @param name The name of this object */ - BoxContainer( TQObject *tqparent = 0, const char * name = 0 ); + BoxContainer( TQObject *parent = 0, const char * name = 0 ); /** * Destructor */ diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index 1f4be46a2..c412a07b2 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -47,8 +47,8 @@ #include <tqtooltip.h> #include <tqvbox.h> -BoxContainerItem::BoxContainerItem( TQObject * tqparent, const char * name ) - : AccountManager( tqparent, name ), +BoxContainerItem::BoxContainerItem( TQObject * parent, const char * name ) + : AccountManager( parent, name ), DCOPObject(), _command( new TQString ) { @@ -211,10 +211,10 @@ void BoxContainerItem::fillKPopupMenu( KPopupMenu* popupMenu, KActionCollection* KStdAction::aboutApp( this, TQT_SLOT( about() ), actions )->plug( popupMenu ); } -void BoxContainerItem::showPassivePopup( TQWidget* tqparent, TQPtrList< KornMailSubject >* list, int total, +void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSubject >* list, int total, const TQString &accountName, bool date ) { - KPassivePopup *popup = new KPassivePopup( tqparent, "Passive popup" ); + KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" ); TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).tqarg( TQString(objId()) ).tqarg( accountName ) .tqarg( total ), "", TQPixmap(), 0 ); diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h index 5393852ae..bd03801a8 100644 --- a/korn/boxcontaineritem.h +++ b/korn/boxcontaineritem.h @@ -51,11 +51,11 @@ public: * This constructor implements the default arguments for any TQObject. * Note that is does not give a name to DCOPObject; that name * is set in the readConfig-function. - * @param tqparent The tqparent of this object, See Object::TQObject + * @param parent The parent of this object, See Object::TQObject * @param name The name of this object, See TQObject::TQObject * @see BoxContainerItem::readConfig */ - BoxContainerItem( TQObject * tqparent = 0, const char * name = 0 ); + BoxContainerItem( TQObject * parent = 0, const char * name = 0 ); /** * The default destructor. This only removes _command-pointer. @@ -124,13 +124,13 @@ protected: /** * This displays the passive popup. * - * @param tqparent The Winget of the visual widget + * @param parent The Winget of the visual widget * @param list List with the first (five) subjects * @param total The total numbers of unread mail * @param accountName The name of the account it belongs to * @param date Should the date be displayed? */ - void showPassivePopup( TQWidget* tqparent, TQPtrList< KornMailSubject >* list, int total, const TQString& accountName, bool date ); + void showPassivePopup( TQWidget* parent, TQPtrList< KornMailSubject >* list, int total, const TQString& accountName, bool date ); //this functions should be reimplemented /** diff --git a/korn/dcopdropif.h b/korn/dcopdropif.h index 48514164a..9e755ac69 100644 --- a/korn/dcopdropif.h +++ b/korn/dcopdropif.h @@ -32,7 +32,7 @@ K_DCOP public: /** * Constructor - * @param drop The tqparent DCOPDrop + * @param drop The parent DCOPDrop * @param name The name of the dcop-object */ DCOPDropInterface( DCOPDrop* drop, const char* name ); diff --git a/korn/dockedcontainer.cpp b/korn/dockedcontainer.cpp index 989e19f03..5e2463886 100644 --- a/korn/dockedcontainer.cpp +++ b/korn/dockedcontainer.cpp @@ -20,8 +20,8 @@ #include "dockeditem.h" -DockedContainer::DockedContainer( TQObject * tqparent, const char * name ) - : BoxContainer( tqparent, name ) +DockedContainer::DockedContainer( TQObject * parent, const char * name ) + : BoxContainer( parent, name ) { } diff --git a/korn/dockedcontainer.h b/korn/dockedcontainer.h index d40623b65..06a833f28 100644 --- a/korn/dockedcontainer.h +++ b/korn/dockedcontainer.h @@ -31,7 +31,7 @@ class DockedContainer : public BoxContainer { Q_OBJECT TQ_OBJECT public: - DockedContainer( TQObject * tqparent = 0, const char * name = 0 ); + DockedContainer( TQObject * parent = 0, const char * name = 0 ); ~DockedContainer(); protected: diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index dc55b3c08..5ff6fb8af 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -36,9 +36,9 @@ #include <tqpixmap.h> #include <tqmovie.h> -DockedItem::DockedItem( TQWidget * tqparent, const char * name ) - : BoxContainerItem( TQT_TQOBJECT(tqparent), name ), - _systemtray( new SystemTray( tqparent, "System tray" ) ) +DockedItem::DockedItem( TQWidget * parent, const char * name ) + : BoxContainerItem( TQT_TQOBJECT(parent), name ), + _systemtray( new SystemTray( parent, "System tray" ) ) { this->fillKPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() ); diff --git a/korn/dockeditem.h b/korn/dockeditem.h index 4500d8776..e5737608e 100644 --- a/korn/dockeditem.h +++ b/korn/dockeditem.h @@ -40,10 +40,10 @@ class DockedItem : public BoxContainerItem public: /** * This contructor gives all it parameters to its parents. - * @param parant The tqparent window + * @param parant The parent window * @param name The name of the TQObject's parents. */ - DockedItem( TQWidget * tqparent = 0, const char * name = 0 ); + DockedItem( TQWidget * parent = 0, const char * name = 0 ); /** * Empty destructor; does nothing at the moment */ @@ -55,7 +55,7 @@ public: virtual void showBox(); /** - * This functions reads the config. It used the tqparent + * This functions reads the config. It used the parent * version for the main things, but it is possible to * add some configurations over here. * @param config The KConfig-instance which contains the settings of this tray-item. diff --git a/korn/hvcontainer.cpp b/korn/hvcontainer.cpp index 636a9a8fc..fa815179d 100644 --- a/korn/hvcontainer.cpp +++ b/korn/hvcontainer.cpp @@ -24,8 +24,8 @@ #include <tqvbox.h> -HVContainer::HVContainer( Qt::Orientation orientation, TQObject * tqparent, const char * name ) - : BoxContainer( tqparent, name ), +HVContainer::HVContainer( Qt::Orientation orientation, TQObject * parent, const char * name ) + : BoxContainer( parent, name ), box( 0 ) { if( orientation == Qt::Horizontal ) diff --git a/korn/hvcontainer.h b/korn/hvcontainer.h index b590aa553..049d32d6e 100644 --- a/korn/hvcontainer.h +++ b/korn/hvcontainer.h @@ -38,7 +38,7 @@ public: * * @param orientation The orientation of the box: it is a vertical or horizontal box? */ - HVContainer( Qt::Orientation orientation, TQObject * tqparent = 0 , const char * name = 0 ); + HVContainer( Qt::Orientation orientation, TQObject * parent = 0 , const char * name = 0 ); ~HVContainer(); /** diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index fa4190d3e..bf621445f 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -30,9 +30,9 @@ #include <tqcursor.h> #include <tqtooltip.h> -HVItem::HVItem( TQWidget *tqparent, const char *name ) +HVItem::HVItem( TQWidget *parent, const char *name ) : BoxContainerItem( 0, name ), - _label( new Label( tqparent, "label" ) ), + _label( new Label( parent, "label" ) ), _popup( new KPopupMenu( _label, "popupmenu" ) ), _actions( new KActionCollection( _popup, "actions" ) ) { diff --git a/korn/hvitem.h b/korn/hvitem.h index 8cb62eaa8..98e420252 100644 --- a/korn/hvitem.h +++ b/korn/hvitem.h @@ -33,7 +33,7 @@ class HVItem : public BoxContainerItem { Q_OBJECT TQ_OBJECT public: - HVItem( TQWidget *tqparent = 0, const char *name = 0 ); + HVItem( TQWidget *parent = 0, const char *name = 0 ); ~HVItem(); /** diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp index 44ef514c4..d5ae323a5 100644 --- a/korn/keditlistboxman.cpp +++ b/korn/keditlistboxman.cpp @@ -24,9 +24,9 @@ #include <tqmap.h> #include <tqstring.h> -KEditListBoxManager::KEditListBoxManager( TQWidget *tqparent, const char *name, +KEditListBoxManager::KEditListBoxManager( TQWidget *parent, const char *name, bool checkAtEntering, int buttons ) - : KEditListBox( tqparent, name, checkAtEntering, buttons ), + : KEditListBox( parent, name, checkAtEntering, buttons ), _config( 0 ), _groupName( 0 ), _subGroupName( 0 ), @@ -35,10 +35,10 @@ KEditListBoxManager::KEditListBoxManager( TQWidget *tqparent, const char *name, init(); } -KEditListBoxManager::KEditListBoxManager( const TQString& title, TQWidget *tqparent, +KEditListBoxManager::KEditListBoxManager( const TQString& title, TQWidget *parent, const char *name, bool checkAtEntering, int buttons) - : KEditListBox( title, tqparent, name, checkAtEntering, buttons ), + : KEditListBox( title, parent, name, checkAtEntering, buttons ), _config( 0 ), _groupName( 0 ), _subGroupName( 0 ), @@ -49,9 +49,9 @@ KEditListBoxManager::KEditListBoxManager( const TQString& title, TQWidget *tqpar KEditListBoxManager::KEditListBoxManager( const TQString& title, const KEditListBox::CustomEditor &customEditor, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool checkAtEntering, int buttons ) - : KEditListBox( title, customEditor, tqparent, name, checkAtEntering, buttons ), + : KEditListBox( title, customEditor, parent, name, checkAtEntering, buttons ), _config( 0 ), _groupName( 0 ), _subGroupName( 0 ), diff --git a/korn/keditlistboxman.h b/korn/keditlistboxman.h index 45fb9d69a..0432e76e7 100644 --- a/korn/keditlistboxman.h +++ b/korn/keditlistboxman.h @@ -38,13 +38,13 @@ public: /** * Constructor: @see KEditListBoxManager::KEditListBoxManager( const TQString&, TQWidget, const char * name, bool, int ) */ - KEditListBoxManager( TQWidget *tqparent = 0, const char *name = 0, + KEditListBoxManager( TQWidget *parent = 0, const char *name = 0, bool checkAtEntering=true, int buttons = All ); /** * The save as above, but with other options for KEditListBox. */ - KEditListBoxManager( const TQString& title, TQWidget *tqparent = 0, + KEditListBoxManager( const TQString& title, TQWidget *parent = 0, const char *name = 0, bool checkAtEntering=true, int buttons = All ); @@ -53,7 +53,7 @@ public: */ KEditListBoxManager( const TQString& title, const KEditListBox::CustomEditor &customEditor, - TQWidget *tqparent = 0, const char *name = 0, + TQWidget *parent = 0, const char *name = 0, bool checkAtEntering = true, int buttons = All ); /** diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp index e43b97060..a1635fd9f 100644 --- a/korn/kio_count.cpp +++ b/korn/kio_count.cpp @@ -34,8 +34,8 @@ #include <tqstring.h> -KIO_Count::KIO_Count( TQObject * tqparent, const char * name ) - : TQObject ( tqparent, name ), +KIO_Count::KIO_Count( TQObject * parent, const char * name ) + : TQObject ( parent, name ), _kurl( 0 ), _metadata( 0 ), _protocol( 0 ), diff --git a/korn/kio_count.h b/korn/kio_count.h index c97ce2f64..3b555739d 100644 --- a/korn/kio_count.h +++ b/korn/kio_count.h @@ -45,7 +45,7 @@ class KIO_Count : public TQObject { Q_OBJECT TQ_OBJECT public: - KIO_Count( TQObject * tqparent = 0, const char * name = 0 ); + KIO_Count( TQObject * parent = 0, const char * name = 0 ); ~KIO_Count(); //This function starts counting diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp index b506f0b2c..576463bef 100644 --- a/korn/kio_delete.cpp +++ b/korn/kio_delete.cpp @@ -32,7 +32,7 @@ #include <tqptrlist.h> -KIO_Delete::KIO_Delete( TQObject * tqparent, const char * name ) : TQObject( tqparent, name ), +KIO_Delete::KIO_Delete( TQObject * parent, const char * name ) : TQObject( parent, name ), _kio( 0 ), _total( 0 ), _jobs( 0 ), diff --git a/korn/kio_delete.h b/korn/kio_delete.h index 30c955549..3358d8b33 100644 --- a/korn/kio_delete.h +++ b/korn/kio_delete.h @@ -39,7 +39,7 @@ class KIO_Delete : public TQObject TQ_OBJECT public: //constructors - KIO_Delete( TQObject * tqparent = 0, const char * name = 0 ); + KIO_Delete( TQObject * parent = 0, const char * name = 0 ); ~KIO_Delete( ); //This function should be called if there are messages to be deleted. diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp index 840c09f27..c14377c0b 100644 --- a/korn/kio_read.cpp +++ b/korn/kio_read.cpp @@ -33,8 +33,8 @@ #include <tqcstring.h> #include <tqstring.h> -KIO_Read::KIO_Read( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +KIO_Read::KIO_Read( TQObject * parent, const char * name ) + : TQObject( parent, name ), _job( 0 ), _message( 0 ) { diff --git a/korn/kio_read.h b/korn/kio_read.h index 234cd36af..c890b2ec5 100644 --- a/korn/kio_read.h +++ b/korn/kio_read.h @@ -36,7 +36,7 @@ class KIO_Read : public TQObject { Q_OBJECT TQ_OBJECT public: - KIO_Read( TQObject * tqparent = 0, const char * name = 0 ); + KIO_Read( TQObject * parent = 0, const char * name = 0 ); ~KIO_Read(); public slots: diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp index 7d6e87987..fad2790b5 100644 --- a/korn/kio_single_subject.cpp +++ b/korn/kio_single_subject.cpp @@ -35,10 +35,10 @@ #include <tqcstring.h> #include <tqstring.h> -KIO_Single_Subject::KIO_Single_Subject( TQObject * tqparent, const char * name, +KIO_Single_Subject::KIO_Single_Subject( TQObject * parent, const char * name, KURL &kurl, KIO::MetaData &metadata, const KIO_Protocol * protocol, KIO::Slave *& slave, const TQString &url, const long size ) - : TQObject( tqparent, name ) + : TQObject( parent, name ) { _kurl = new KURL( kurl ); _metadata = new KIO::MetaData( metadata ); diff --git a/korn/kio_single_subject.h b/korn/kio_single_subject.h index 800638cb6..472148e9c 100644 --- a/korn/kio_single_subject.h +++ b/korn/kio_single_subject.h @@ -36,7 +36,7 @@ class KIO_Single_Subject : public TQObject { Q_OBJECT TQ_OBJECT public: - KIO_Single_Subject( TQObject * tqparent, const char * name, KURL &, KIO::MetaData &, const KIO_Protocol *, + KIO_Single_Subject( TQObject * parent, const char * name, KURL &, KIO::MetaData &, const KIO_Protocol *, KIO::Slave *&, const TQString &, const long ); ~KIO_Single_Subject( ); diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp index 91da7a823..2e1e33855 100644 --- a/korn/kio_subjects.cpp +++ b/korn/kio_subjects.cpp @@ -31,8 +31,8 @@ #include <tqvaluelist.h> #include <tqstring.h> -KIO_Subjects::KIO_Subjects( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +KIO_Subjects::KIO_Subjects( TQObject * parent, const char * name ) + : TQObject( parent, name ), _protocol( 0 ), _slave( 0 ), _valid( true ) diff --git a/korn/kio_subjects.h b/korn/kio_subjects.h index 3e16d3269..871054761 100644 --- a/korn/kio_subjects.h +++ b/korn/kio_subjects.h @@ -38,7 +38,7 @@ class KIO_Subjects : public TQObject { Q_OBJECT TQ_OBJECT public: - KIO_Subjects( TQObject * tqparent, const char * name ); + KIO_Subjects( TQObject * parent, const char * name ); ~KIO_Subjects( ); //This function let it start fetching headers. diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index 56f64b765..ce1c9058b 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/korn/kornaccountcfgimpl.cpp @@ -37,8 +37,8 @@ #include <tqlabel.h> #include <tqwidget.h> -KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * tqparent, const char * name ) - : KornAccountCfg( tqparent, name ), +KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name ) + : KornAccountCfg( parent, name ), _config( 0 ), _fields( 0 ), _urlfields( 0 ), @@ -49,8 +49,8 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * tqparent, const char * name ) _groupBoxes( 0 ), _accountinput( new TQPtrList< AccountInput >() ) { - connect( tqparent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( tqparent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); + connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); this->cbProtocol->insertStringList( Protocols::getProtocols() ); @@ -205,14 +205,14 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto ) grid->setMargin( 15 ); for( input = _accountinput->first(); input; input = _accountinput->next() ) { - if( input->leftWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->leftWidget()->tqparent()) ) + if( input->leftWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->leftWidget()->parent()) ) { grid->addWidget( input->leftWidget(), counter, 0 ); - if( input->rightWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->rightWidget()->tqparent()) ) + if( input->rightWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->rightWidget()->parent()) ) grid->addWidget( input->rightWidget(), counter, 1 ); ++counter; } else { - if( input->rightWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->rightWidget()->tqparent()) ) + if( input->rightWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->rightWidget()->parent()) ) { grid->addWidget( input->rightWidget(), counter, 1 ); ++counter; diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h index d00da5091..10c1cbf71 100644 --- a/korn/kornaccountcfgimpl.h +++ b/korn/kornaccountcfgimpl.h @@ -39,7 +39,7 @@ class KornAccountCfgImpl : public KornAccountCfg { Q_OBJECT TQ_OBJECT public: - KornAccountCfgImpl( TQWidget * tqparent = 0, const char * name = 0 ); + KornAccountCfgImpl( TQWidget * parent = 0, const char * name = 0 ); ~KornAccountCfgImpl(); void readConfig( KConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr ); diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index ff6b034fd..4cb911bef 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -38,8 +38,8 @@ class KConfig; #include <tqlabel.h> #include <tqstring.h> -KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * tqparent, const char * name ) - : KornBoxCfg( tqparent, name ), +KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name ) + : KornBoxCfg( parent, name ), _config( 0 ), _base( 0 ), _index( -1 ) @@ -56,8 +56,8 @@ KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * tqparent, const char * name ) if( lbRight->text() == "Right" ) lbRight->setText( i18n( "Right" ) ); - connect( tqparent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( tqparent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); + connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); elbAccounts->setTitle( i18n( "Accounts" ) ); diff --git a/korn/kornboxcfgimpl.h b/korn/kornboxcfgimpl.h index a3802b810..ffcd97474 100644 --- a/korn/kornboxcfgimpl.h +++ b/korn/kornboxcfgimpl.h @@ -33,7 +33,7 @@ class KornBoxCfgImpl : public KornBoxCfg { Q_OBJECT TQ_OBJECT public: - KornBoxCfgImpl( TQWidget *tqparent, const char * name ); + KornBoxCfgImpl( TQWidget *parent, const char * name ); ~KornBoxCfgImpl(); /** diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index 219cbcc0f..0616e6fee 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -35,10 +35,10 @@ /* - * tqparent should be of type KDialogBase + * parent should be of type KDialogBase */ -KornCfgImpl::KornCfgImpl( TQWidget * tqparent, const char * name ) - : KornCfgWidget( tqparent, name ), +KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name ) + : KornCfgWidget( parent, name ), _config( new KConfig( "kornrc" ) ), _base( 0 ) { @@ -47,9 +47,9 @@ KornCfgImpl::KornCfgImpl( TQWidget * tqparent, const char * name ) elbBoxes->setConfig( _config ); elbBoxes->setTitle( i18n( "Boxes" ) ); - connect( tqparent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( tqparent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); - connect( tqparent, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); + connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); + connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( parent, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); connect( elbBoxes, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotElementsSwapped( int, int ) ) ); connect( elbBoxes, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotElementDeleted( int ) ) ); diff --git a/korn/korncfgimpl.h b/korn/korncfgimpl.h index 1168ec08c..aef4be1f2 100644 --- a/korn/korncfgimpl.h +++ b/korn/korncfgimpl.h @@ -31,7 +31,7 @@ class KornCfgImpl : public KornCfgWidget { Q_OBJECT TQ_OBJECT public: - KornCfgImpl( TQWidget * tqparent = 0, const char * name = 0 ); + KornCfgImpl( TQWidget * parent = 0, const char * name = 0 ); ~KornCfgImpl(); private slots: diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index 78db0b256..eb3a0253b 100644 --- a/korn/kornshell.cpp +++ b/korn/kornshell.cpp @@ -32,8 +32,8 @@ #include <tqtimer.h> -KornShell::KornShell( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ), +KornShell::KornShell( TQWidget * parent, const char * name ) + : TQWidget( parent, name ), _config( new KConfig( "kornrc" ) ), _box( 0 ), _configDialog( 0 ), diff --git a/korn/kornshell.h b/korn/kornshell.h index aa97c40a5..56859863f 100644 --- a/korn/kornshell.h +++ b/korn/kornshell.h @@ -33,7 +33,7 @@ class KornShell : public TQWidget { Q_OBJECT TQ_OBJECT public: - KornShell( TQWidget * tqparent = 0, const char * name = 0 ); + KornShell( TQWidget * parent = 0, const char * name = 0 ); ~KornShell(); void show(); diff --git a/korn/label.h b/korn/label.h index 86db3c427..c8d9b4852 100644 --- a/korn/label.h +++ b/korn/label.h @@ -29,7 +29,7 @@ class Label : public TQLabel { Q_OBJECT TQ_OBJECT public: - Label( TQWidget * tqparent = 0, const char * name = 0 ) : TQLabel( tqparent, name ) {} + Label( TQWidget * parent = 0, const char * name = 0 ) : TQLabel( parent, name ) {} virtual ~Label() {} protected: diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp index 5ea61430f..3424e19e4 100644 --- a/korn/maildlg.cpp +++ b/korn/maildlg.cpp @@ -7,8 +7,8 @@ #include <tqprogressdialog.h> #include "maildrop.h" -KornMailDlg::KornMailDlg( TQWidget *tqparent ) - : KDialogBase( tqparent, "maildialog", true, i18n("Mail Details"), User1|Close, Close, true, KGuiItem(i18n("&Full Message"))), +KornMailDlg::KornMailDlg( TQWidget *parent ) + : KDialogBase( parent, "maildialog", true, i18n("Mail Details"), User1|Close, Close, true, KGuiItem(i18n("&Full Message"))), _progress( 0 ) { TQWidget * page = new TQWidget( this ); diff --git a/korn/maildlg.h b/korn/maildlg.h index 68f8f30e9..81917bb40 100644 --- a/korn/maildlg.h +++ b/korn/maildlg.h @@ -46,9 +46,9 @@ class KornMailDlg : public KDialogBase public: /** * KornMailDlg Constructor - * @param tqparent tqparent widget + * @param parent parent widget */ - KornMailDlg( TQWidget *tqparent=0 ); + KornMailDlg( TQWidget *parent=0 ); /** * Set the mail details to show. The mails body is transfered to the edit control diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index 593ea212b..43e5102dc 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -13,9 +13,9 @@ #include "maildlg.h" #include "progress_dialog.h" -KornSubjectsDlg::SubjectListViewItem::SubjectListViewItem( TQListView *tqparent, KornMailSubject * item) +KornSubjectsDlg::SubjectListViewItem::SubjectListViewItem( TQListView *parent, KornMailSubject * item) // set the column strings except column 2 (date) - : KListViewItem(tqparent, item->getSender(), item->getSubject(), "", KGlobal::locale()->formatNumber(item->getSize(), 0)) + : KListViewItem(parent, item->getSender(), item->getSubject(), "", KGlobal::locale()->formatNumber(item->getSize(), 0)) , _mailSubject( new KornMailSubject( *item ) ) { // convert the date according to the user settings and show it in column 2 @@ -53,8 +53,8 @@ int KornSubjectsDlg::SubjectListViewItem::compare( TQListViewItem* item, int col } } -KornSubjectsDlg::KornSubjectsDlg( TQWidget *tqparent ) - : KDialogBase( tqparent, "urldialog", true, "test", Close, Close, true), _mailDrop( new TQPtrList< KMailDrop > ), +KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) + : KDialogBase( parent, "urldialog", true, "test", Close, Close, true), _mailDrop( new TQPtrList< KMailDrop > ), _subjects(0), _delete(0), mailDlg(0), _canDeleteMaildrop( true ) { _loadSubjectsCanceled = false; diff --git a/korn/subjectsdlg.h b/korn/subjectsdlg.h index 8201e8e6d..e7c8a985e 100644 --- a/korn/subjectsdlg.h +++ b/korn/subjectsdlg.h @@ -36,11 +36,11 @@ class KornSubjectsDlg: public KDialogBase public: /** * SubjectListViewItem Constructor - * @param tqparent list view + * @param parent list view * @param item KornMailSubject this item should represent. It is NOT deleted * if SubjectListViewItem is deleted. */ - SubjectListViewItem( TQListView *tqparent, KornMailSubject * item); + SubjectListViewItem( TQListView *parent, KornMailSubject * item); /** * SubjectListViewItem Destructor @@ -104,9 +104,9 @@ class KornSubjectsDlg: public KDialogBase public: /** * KornSubjectsDlg Constructor - * @param tqparent tqparent widget + * @param parent parent widget */ - KornSubjectsDlg( TQWidget *tqparent=0 ); + KornSubjectsDlg( TQWidget *parent=0 ); /** * This functions clears all available KMailDrop's. diff --git a/korn/systemtray.cpp b/korn/systemtray.cpp index 67a58eb0d..e7ca45f73 100644 --- a/korn/systemtray.cpp +++ b/korn/systemtray.cpp @@ -24,8 +24,8 @@ #include <tqmovie.h> -SystemTray::SystemTray( TQWidget * tqparent, const char * name ) - : KSystemTray( tqparent, name ) +SystemTray::SystemTray( TQWidget * parent, const char * name ) + : KSystemTray( parent, name ) { } diff --git a/korn/systemtray.h b/korn/systemtray.h index 54fba1a4f..3cf3fe2cc 100644 --- a/korn/systemtray.h +++ b/korn/systemtray.h @@ -35,10 +35,10 @@ class SystemTray : public KSystemTray public: /** * This contructor gives all it parameters to its parents. - * @param parant The tqparent window + * @param parant The parent window * @param name The name of the TQObject's parents. */ - SystemTray( TQWidget * tqparent = 0, const char * name = 0 ); + SystemTray( TQWidget * parent = 0, const char * name = 0 ); /** * Empty destructor; does nothing at the moment */ diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/kresources/birthdays/resourcekabcconfig.cpp index 1f55138f1..2f7671dc7 100644 --- a/kresources/birthdays/resourcekabcconfig.cpp +++ b/kresources/birthdays/resourcekabcconfig.cpp @@ -33,8 +33,8 @@ using namespace KCal; -ResourceKABCConfig::ResourceKABCConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { TQGridLayout *topLayout = new TQGridLayout( this, 5, 1, 11, 6 ); diff --git a/kresources/birthdays/resourcekabcconfig.h b/kresources/birthdays/resourcekabcconfig.h index 81fbdf10a..b2e1fb7ea 100644 --- a/kresources/birthdays/resourcekabcconfig.h +++ b/kresources/birthdays/resourcekabcconfig.h @@ -43,7 +43,7 @@ class ResourceKABCConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - ResourceKABCConfig( TQWidget* tqparent = 0, const char* name = 0 ); + ResourceKABCConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource); diff --git a/kresources/blogging/API_Blog.cpp b/kresources/blogging/API_Blog.cpp index 2ad11c1dc..981390fa1 100644 --- a/kresources/blogging/API_Blog.cpp +++ b/kresources/blogging/API_Blog.cpp @@ -12,8 +12,8 @@ using namespace KBlog; -APIBlog::APIBlog( const KURL &url, TQObject *tqparent, const char *name ) : - TQObject( tqparent, name ), +APIBlog::APIBlog( const KURL &url, TQObject *parent, const char *name ) : + TQObject( parent, name ), mServerURL( url ), mAppID( TQString() ), mDownloadCount( 20 ) {} diff --git a/kresources/blogging/API_Blog.h b/kresources/blogging/API_Blog.h index c3ed7d071..b8229cf8b 100644 --- a/kresources/blogging/API_Blog.h +++ b/kresources/blogging/API_Blog.h @@ -86,7 +86,7 @@ class APIBlog : public TQObject Q_OBJECT TQ_OBJECT public: - APIBlog( const KURL &server, TQObject *tqparent = 0L, const char *name = 0L ); + APIBlog( const KURL &server, TQObject *parent = 0L, const char *name = 0L ); virtual ~APIBlog(); virtual TQString interfaceName() const = 0; diff --git a/kresources/blogging/API_Blogger.h b/kresources/blogging/API_Blogger.h index 5255e19fc..32610bf60 100644 --- a/kresources/blogging/API_Blogger.h +++ b/kresources/blogging/API_Blogger.h @@ -32,7 +32,7 @@ namespace KBlog { class APIBlogger : public APIBlog { public: - APIBlogger( const KURL &server, TQObject *tqparent = 0L, const char *name = 0L ) : APIBlog( server, tqparent, name ) {} + APIBlogger( const KURL &server, TQObject *parent = 0L, const char *name = 0L ) : APIBlog( server, parent, name ) {} TQString getFunctionName( blogFunctions type ); TQString interfaceName() const { return "Blogger API 1.0"; } diff --git a/kresources/blogging/kcal_resourcebloggingconfig.cpp b/kresources/blogging/kcal_resourcebloggingconfig.cpp index 04f62cf91..d68584a2b 100644 --- a/kresources/blogging/kcal_resourcebloggingconfig.cpp +++ b/kresources/blogging/kcal_resourcebloggingconfig.cpp @@ -25,7 +25,7 @@ using namespace KCal; -ResourceBloggingConfig::ResourceBloggingConfig( TQWidget *tqparent, const char *name ) : ResourceGroupwareBaseConfig( tqparent, name ) +ResourceBloggingConfig::ResourceBloggingConfig( TQWidget *parent, const char *name ) : ResourceGroupwareBaseConfig( parent, name ) { } diff --git a/kresources/blogging/kcal_resourcebloggingconfig.h b/kresources/blogging/kcal_resourcebloggingconfig.h index d15c89757..c8ff2aa67 100644 --- a/kresources/blogging/kcal_resourcebloggingconfig.h +++ b/kresources/blogging/kcal_resourcebloggingconfig.h @@ -30,7 +30,7 @@ class KDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig Q_OBJECT TQ_OBJECT public: - ResourceBloggingConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceBloggingConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void saveSettings( KRES::Resource *resource ); diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp index 9a89cf5ab..ae2b1b802 100644 --- a/kresources/blogging/xmlrpcjob.cpp +++ b/kresources/blogging/xmlrpcjob.cpp @@ -72,7 +72,7 @@ XmlrpcJob::XmlrpcJob( const KURL& url, const TQString& method, showProgressInfo ) { d = new XmlrpcJobPrivate; - // We couldn't set the args when calling the tqparent constructor, + // We couldn't set the args when calling the parent constructor, // so do it now. TQDataStream stream( m_packedArgs, IO_WriteOnly ); stream << (int)1 << url; diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp index dbab62d7f..f3cf57fdc 100644 --- a/kresources/caldav/config.cpp +++ b/kresources/caldav/config.cpp @@ -70,8 +70,8 @@ CalDavPrefs* ResourceCalDavConfig::getPrefs(ResourceCalDav* res) { | CONSTRUCTOR / DESTRUCTOR ========================================================================*/ -ResourceCalDavConfig::ResourceCalDavConfig( TQWidget *tqparent ) - : KRES::ConfigWidget( tqparent ) +ResourceCalDavConfig::ResourceCalDavConfig( TQWidget *parent ) + : KRES::ConfigWidget( parent ) { setupUI(); } diff --git a/kresources/caldav/config.h b/kresources/caldav/config.h index ccda9234b..cfa612d37 100644 --- a/kresources/caldav/config.h +++ b/kresources/caldav/config.h @@ -44,7 +44,7 @@ class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget public: - ResourceCalDavConfig(TQWidget *tqparent = 0); + ResourceCalDavConfig(TQWidget *parent = 0); public slots: diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp index e84eb2eb2..4a7072b5f 100644 --- a/kresources/caldav/configwidgets.cpp +++ b/kresources/caldav/configwidgets.cpp @@ -74,8 +74,8 @@ class CalDavSaveConfig::Private }; //@endcond -CalDavReloadConfig::CalDavReloadConfig( TQWidget *tqparent ) - : TQWidget( tqparent ), d( new KCal::CalDavReloadConfig::Private() ) +CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) + : TQWidget( parent ), d( new KCal::CalDavReloadConfig::Private() ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -148,8 +148,8 @@ void CalDavReloadConfig::slotIntervalToggled( bool checked ) } } -CalDavSaveConfig::CalDavSaveConfig( TQWidget *tqparent ) - : TQWidget( tqparent ), d( new KCal::CalDavSaveConfig::Private() ) +CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) + : TQWidget( parent ), d( new KCal::CalDavSaveConfig::Private() ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/kresources/caldav/configwidgets.h b/kresources/caldav/configwidgets.h index 2c9dcb6dc..6ceb0c717 100644 --- a/kresources/caldav/configwidgets.h +++ b/kresources/caldav/configwidgets.h @@ -52,7 +52,7 @@ class KDE_EXPORT CalDavReloadConfig : public TQWidget Q_OBJECT TQ_OBJECT public: - explicit CalDavReloadConfig( TQWidget *tqparent = 0 ); + explicit CalDavReloadConfig( TQWidget *parent = 0 ); ~CalDavReloadConfig(); public slots: void loadSettings( ResourceCached *resource ); @@ -79,7 +79,7 @@ class KDE_EXPORT CalDavSaveConfig : public TQWidget Q_OBJECT TQ_OBJECT public: - explicit CalDavSaveConfig( TQWidget *tqparent = 0 ); + explicit CalDavSaveConfig( TQWidget *parent = 0 ); ~CalDavSaveConfig(); public slots: diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp index a7a4af54a..c79ef06ac 100644 --- a/kresources/caldav/job.cpp +++ b/kresources/caldav/job.cpp @@ -166,8 +166,8 @@ void CalDavJob::run() { // Signal done // 1000 is read, 1001 is write - if (type() == 0) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) ); - if (type() == 1) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) ); + if (type() == 0) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) ); + if (type() == 1) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) ); } // EOF ======================================================================== diff --git a/kresources/caldav/job.h b/kresources/caldav/job.h index c19f2bf24..7d312d90b 100644 --- a/kresources/caldav/job.h +++ b/kresources/caldav/job.h @@ -68,7 +68,7 @@ public: } /** - * Sets the tqparent qobject. + * Sets the parent qobject. */ virtual void setParent(TQObject *s) { mParent = s; @@ -103,9 +103,9 @@ public: } /** - * @return tqparent object + * @return parent object */ - virtual TQObject *tqparent() { + virtual TQObject *parent() { return mParent; } diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp index 70a3caf12..390e3adc7 100644 --- a/kresources/carddav/config.cpp +++ b/kresources/carddav/config.cpp @@ -69,8 +69,8 @@ CardDavPrefs* ResourceCardDavConfig::getPrefs(ResourceCardDav* res) { | CONSTRUCTOR / DESTRUCTOR ========================================================================*/ -ResourceCardDavConfig::ResourceCardDavConfig( TQWidget *tqparent ) - : KRES::ConfigWidget( tqparent ) +ResourceCardDavConfig::ResourceCardDavConfig( TQWidget *parent ) + : KRES::ConfigWidget( parent ) { setupUI(); } diff --git a/kresources/carddav/config.h b/kresources/carddav/config.h index 4fd95511d..8e0a71003 100644 --- a/kresources/carddav/config.h +++ b/kresources/carddav/config.h @@ -43,7 +43,7 @@ class KDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget public: - ResourceCardDavConfig(TQWidget *tqparent = 0); + ResourceCardDavConfig(TQWidget *parent = 0); public slots: diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp index fbc19c7e3..b159a0211 100644 --- a/kresources/carddav/configwidgets.cpp +++ b/kresources/carddav/configwidgets.cpp @@ -73,8 +73,8 @@ class CardDavSaveConfig::Private }; //@endcond -CardDavReloadConfig::CardDavReloadConfig( TQWidget *tqparent ) - : TQWidget( tqparent ), d( new KABC::CardDavReloadConfig::Private() ) +CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent ) + : TQWidget( parent ), d( new KABC::CardDavReloadConfig::Private() ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -147,8 +147,8 @@ void CardDavReloadConfig::slotIntervalToggled( bool checked ) } } -CardDavSaveConfig::CardDavSaveConfig( TQWidget *tqparent ) - : TQWidget( tqparent ), d( new KABC::CardDavSaveConfig::Private() ) +CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent ) + : TQWidget( parent ), d( new KABC::CardDavSaveConfig::Private() ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/kresources/carddav/configwidgets.h b/kresources/carddav/configwidgets.h index 47b92bfaf..9fb849424 100644 --- a/kresources/carddav/configwidgets.h +++ b/kresources/carddav/configwidgets.h @@ -51,7 +51,7 @@ class KDE_EXPORT CardDavReloadConfig : public TQWidget Q_OBJECT TQ_OBJECT public: - explicit CardDavReloadConfig( TQWidget *tqparent = 0 ); + explicit CardDavReloadConfig( TQWidget *parent = 0 ); ~CardDavReloadConfig(); public slots: void loadSettings( ResourceCached *resource ); @@ -78,7 +78,7 @@ class KDE_EXPORT CardDavSaveConfig : public TQWidget Q_OBJECT TQ_OBJECT public: - explicit CardDavSaveConfig( TQWidget *tqparent = 0 ); + explicit CardDavSaveConfig( TQWidget *parent = 0 ); ~CardDavSaveConfig(); public slots: diff --git a/kresources/carddav/job.cpp b/kresources/carddav/job.cpp index 4d3fd3d43..a842b00a4 100644 --- a/kresources/carddav/job.cpp +++ b/kresources/carddav/job.cpp @@ -103,8 +103,8 @@ void CardDavJob::run() { // Signal done // 1000 is read, 1001 is write - if (type() == 0) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) ); - if (type() == 1) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) ); + if (type() == 0) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) ); + if (type() == 1) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) ); } // EOF ======================================================================== diff --git a/kresources/carddav/job.h b/kresources/carddav/job.h index e40604b9f..52a04bc7a 100644 --- a/kresources/carddav/job.h +++ b/kresources/carddav/job.h @@ -60,7 +60,7 @@ public: } /** - * Sets the tqparent qobject. + * Sets the parent qobject. */ virtual void setParent(TQObject *s) { mParent = s; @@ -88,9 +88,9 @@ public: } /** - * @return tqparent object + * @return parent object */ - virtual TQObject *tqparent() { + virtual TQObject *parent() { return mParent; } diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp index 459a6b6f7..02a2f1ad3 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp @@ -33,8 +33,8 @@ using namespace KABC; -ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() ); diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.h b/kresources/egroupware/kabc_resourcexmlrpcconfig.h index a680cfb01..084f92109 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcconfig.h +++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.h @@ -35,7 +35,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 ); + ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp index 25f4c1f2d..3360d18cd 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp @@ -250,7 +250,7 @@ bool ResourceXMLRPC::doLoad() columns.insert( "type", "task" ); args.insert( "filter", "none" ); args.insert( "col_filter", columns ); - args.insert( "order", "id_tqparent" ); + args.insert( "order", "id_parent" ); mServer->call( SearchTodosCommand, args, this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), @@ -1115,7 +1115,7 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args ) Incidence *inc = todo->relatedTo(); if ( inc ) { TQString parentUid = idMapper().remoteId( inc->uid() ); - args.insert( "id_tqparent", parentUid ); + args.insert( "id_parent", parentUid ); } // STATE @@ -1172,13 +1172,13 @@ void ResourceXMLRPC::readTodo( const TQMap<TQString, TQVariant>& args, Todo *tod } // SUBTODO - TQString parentId = args[ "id_tqparent" ].toString(); + TQString parentId = args[ "id_parent" ].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 ) - todo->setRelatedTo( tqparent ); + if ( !localParentUid.isEmpty() ) { // found parent todo + Todo *parent = mCalendar.todo( localParentUid ); + if ( parent ) + todo->setRelatedTo( parent ); } } diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp index 740602b50..36e3b9486 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp @@ -34,8 +34,8 @@ using namespace KCal; -ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() ); diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.h b/kresources/egroupware/kcal_resourcexmlrpcconfig.h index d070eebf4..13e359b00 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcconfig.h +++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.h @@ -36,7 +36,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 ); + ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp index ada19144b..6446a833d 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp @@ -132,7 +132,7 @@ bool ResourceXMLRPC::load() args.clear(); args.insert( "filter", "none" ); args.insert( "col_filter", columns ); - args.insert( "order", "id_tqparent" ); + args.insert( "order", "id_parent" ); mServer->call( SearchNotesCommand, args, this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp index 0e2816b12..224cb9914 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp @@ -34,8 +34,8 @@ using namespace KNotes; -ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() ); diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.h b/kresources/egroupware/knotes_resourcexmlrpcconfig.h index 70201f609..dac45f818 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcconfig.h +++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.h @@ -36,7 +36,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 ); + ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp index 59b467bb2..09176ae6b 100644 --- a/kresources/egroupware/xmlrpciface.cpp +++ b/kresources/egroupware/xmlrpciface.cpp @@ -54,9 +54,9 @@ namespace KXMLRPC }; } -Query *Query::create( const TQVariant &id, TQObject *tqparent, const char *name ) +Query *Query::create( const TQVariant &id, TQObject *parent, const char *name ) { - return new Query( id, tqparent, name ); + return new Query( id, parent, name ); } void Query::call( const TQString &server, const TQString &method, @@ -310,8 +310,8 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const return TQVariant(); } -Query::Query( const TQVariant &id, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), m_id( id ) +Query::Query( const TQVariant &id, TQObject *parent, const char *name ) + : TQObject( parent, name ), m_id( id ) {} Query::~Query() @@ -321,8 +321,8 @@ Query::~Query() (*it)->kill(); } -Server::Server( const KURL &url, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +Server::Server( const KURL &url, TQObject *parent, const char *name ) + : TQObject( parent, name ) { if ( url.isValid() ) m_url = url; diff --git a/kresources/egroupware/xmlrpciface.h b/kresources/egroupware/xmlrpciface.h index 5c49eee8b..4e05dc675 100644 --- a/kresources/egroupware/xmlrpciface.h +++ b/kresources/egroupware/xmlrpciface.h @@ -38,7 +38,7 @@ namespace KXMLRPC static Query *create( const TQVariant &id = TQVariant(), - TQObject *tqparent = 0, const char *name = 0 ); + TQObject *parent = 0, const char *name = 0 ); public slots: void call( const TQString &server, const TQString &method, @@ -66,7 +66,7 @@ namespace KXMLRPC TQString marshal( const TQVariant &v ) const; TQVariant demarshal( const TQDomElement &e ) const; - Query( const TQVariant &id, TQObject *tqparent = 0, const char *name = 0 ); + Query( const TQVariant &id, TQObject *parent = 0, const char *name = 0 ); ~Query(); TQByteArray m_buffer; @@ -81,7 +81,7 @@ namespace KXMLRPC TQ_OBJECT public: Server( const KURL &url = KURL(), - TQObject *tqparent = 0, const char *name = 0 ); + TQObject *parent = 0, const char *name = 0 ); ~Server(); const KURL &url() const { return m_url; } diff --git a/kresources/exchange/resourceexchangeconfig.cpp b/kresources/exchange/resourceexchangeconfig.cpp index 5a20dba0f..36774901b 100644 --- a/kresources/exchange/resourceexchangeconfig.cpp +++ b/kresources/exchange/resourceexchangeconfig.cpp @@ -33,8 +33,8 @@ using namespace KCal; -ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 8, 3 ); diff --git a/kresources/exchange/resourceexchangeconfig.h b/kresources/exchange/resourceexchangeconfig.h index 9e4af8710..b0cf15a13 100644 --- a/kresources/exchange/resourceexchangeconfig.h +++ b/kresources/exchange/resourceexchangeconfig.h @@ -40,7 +40,7 @@ class ResourceExchangeConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceExchangeConfig( TQWidget* tqparent = 0, const char* name = 0 ); + ResourceExchangeConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource); diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp index e108247fa..cce884955 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.cpp +++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp @@ -100,7 +100,7 @@ bool ResourceFeaturePlan::doLoad() } void ResourceFeaturePlan::insertCategories( const Category::List &categories, - Todo *tqparent ) + Todo *parent ) { Category::List::ConstIterator it; for( it = categories.begin(); it != categories.end(); ++it ) { @@ -108,7 +108,7 @@ void ResourceFeaturePlan::insertCategories( const Category::List &categories, Todo *categoryTodo = new Todo; categoryTodo->setSummary( c->name() ); - categoryTodo->setRelatedTo( tqparent ); + categoryTodo->setRelatedTo( parent ); insertCategories( c->categoryList(), categoryTodo ); diff --git a/kresources/featureplan/kcal_resourcefeatureplan.h b/kresources/featureplan/kcal_resourcefeatureplan.h index 68f719a50..67799044e 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.h +++ b/kresources/featureplan/kcal_resourcefeatureplan.h @@ -56,7 +56,7 @@ class KDE_EXPORT ResourceFeaturePlan : public ResourceCached KABC::Lock *lock(); protected: - void insertCategories( const Category::List &categories, Todo *tqparent ); + void insertCategories( const Category::List &categories, Todo *parent ); private: Prefs *mPrefs; diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp index 6478a2131..42043a5dd 100644 --- a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp +++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp @@ -35,9 +35,9 @@ using namespace KCal; -ResourceFeaturePlanConfig::ResourceFeaturePlanConfig( TQWidget *tqparent, +ResourceFeaturePlanConfig::ResourceFeaturePlanConfig( TQWidget *parent, const char *name ) - : KRES::ConfigWidget( tqparent, name ) + : KRES::ConfigWidget( parent, name ) { TQGridLayout *topLayout = new TQGridLayout( this, 3, 2, 0, KDialog::spacingHint() ); diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.h b/kresources/featureplan/kcal_resourcefeatureplanconfig.h index 97da46bec..e27ea94c2 100644 --- a/kresources/featureplan/kcal_resourcefeatureplanconfig.h +++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.h @@ -37,7 +37,7 @@ class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceFeaturePlanConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceFeaturePlanConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: void loadSettings( KRES::Resource * ); diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.cpp b/kresources/groupware/kabc_resourcegroupwareconfig.cpp index efdc7ec42..a930219cb 100644 --- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/kresources/groupware/kabc_resourcegroupwareconfig.cpp @@ -39,8 +39,8 @@ using namespace KABC; class AddressBookItem : public TQCheckListItem { public: - AddressBookItem( KListView *tqparent, const TQString &id ) - : TQCheckListItem( tqparent, "", CheckBox ), + AddressBookItem( KListView *parent, const TQString &id ) + : TQCheckListItem( parent, "", CheckBox ), mId( id ) { setText( 0, mId ); @@ -58,8 +58,8 @@ class AddressBookItem : public TQCheckListItem TQString mId; }; -ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() ); diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.h b/kresources/groupware/kabc_resourcegroupwareconfig.h index 220575c23..06ef4186c 100644 --- a/kresources/groupware/kabc_resourcegroupwareconfig.h +++ b/kresources/groupware/kabc_resourcegroupwareconfig.h @@ -39,7 +39,7 @@ class ResourceGroupwareConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceGroupwareConfig( TQWidget* tqparent = 0, const char* name = 0 ); + ResourceGroupwareConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.cpp b/kresources/groupware/kcal_resourcegroupwareconfig.cpp index dbb76f336..2d5cffe00 100644 --- a/kresources/groupware/kcal_resourcegroupwareconfig.cpp +++ b/kresources/groupware/kcal_resourcegroupwareconfig.cpp @@ -38,8 +38,8 @@ using namespace KCal; -ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 ); diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.h b/kresources/groupware/kcal_resourcegroupwareconfig.h index 761a6aa0d..b55febc8b 100644 --- a/kresources/groupware/kcal_resourcegroupwareconfig.h +++ b/kresources/groupware/kcal_resourcegroupwareconfig.h @@ -43,7 +43,7 @@ class ResourceGroupwareConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - ResourceGroupwareConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceGroupwareConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/kresources/groupwise/groupwisesettingswidget.cpp b/kresources/groupwise/groupwisesettingswidget.cpp index 53f3b0957..60d047123 100644 --- a/kresources/groupwise/groupwisesettingswidget.cpp +++ b/kresources/groupwise/groupwisesettingswidget.cpp @@ -24,8 +24,8 @@ #include "groupwisesettingswidget.h" -GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * tqparent ) -: GroupWiseSettingsWidgetBase( tqparent ) +GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent ) +: GroupWiseSettingsWidgetBase( parent ) { connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ), this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) ); diff --git a/kresources/groupwise/groupwisesettingswidget.h b/kresources/groupwise/groupwisesettingswidget.h index 37027c64c..46c6ca6d9 100644 --- a/kresources/groupwise/groupwisesettingswidget.h +++ b/kresources/groupwise/groupwisesettingswidget.h @@ -33,7 +33,7 @@ class GroupWiseSettingsWidget : public GroupWiseSettingsWidgetBase Q_OBJECT TQ_OBJECT public: - GroupWiseSettingsWidget( TQWidget * tqparent ); + GroupWiseSettingsWidget( TQWidget * parent ); TQMap<TQString, TQString> dirtySettings(); void reset(); protected slots: diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp index 220769077..42896bb01 100644 --- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp +++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp @@ -39,8 +39,8 @@ using namespace KABC; class AddressBookItem : public TQCheckListItem { public: - AddressBookItem( KListView *tqparent, GroupWise::AddressBook ab ) - : TQCheckListItem( tqparent, "", CheckBox ), + AddressBookItem( KListView *parent, GroupWise::AddressBook ab ) + : TQCheckListItem( parent, "", CheckBox ), mId( ab.id ) { setText( 0, ab.name ); @@ -56,8 +56,8 @@ class AddressBookItem : public TQCheckListItem TQString mId; }; -ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() ); diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.h b/kresources/groupwise/kabc_resourcegroupwiseconfig.h index d120f3164..06278834e 100644 --- a/kresources/groupwise/kabc_resourcegroupwiseconfig.h +++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.h @@ -42,7 +42,7 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceGroupwiseConfig( TQWidget* tqparent = 0, const char* name = 0 ); + ResourceGroupwiseConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp index e02cf2c52..78f049e85 100644 --- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -41,8 +41,8 @@ using namespace KCal; -ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 ); @@ -123,7 +123,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings() if ( s ) { - KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(tqparent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) ); + KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) ); // TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog ); GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog ); dialog->setMainWidget( settingsWidget ); diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.h b/kresources/groupwise/kcal_resourcegroupwiseconfig.h index 1687095c5..c27ac5dbb 100644 --- a/kresources/groupwise/kcal_resourcegroupwiseconfig.h +++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.h @@ -44,7 +44,7 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - ResourceGroupwiseConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceGroupwiseConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp index 93a3f0a27..31a89a70a 100644 --- a/kresources/groupwise/soap/groupwiseserver.cpp +++ b/kresources/groupwise/soap/groupwiseserver.cpp @@ -264,8 +264,8 @@ size_t GroupwiseServer::gSoapReceiveCallback( struct soap *soap, char *s, } GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user, - const TQString &password, TQObject *tqparent ) - : TQObject( tqparent, "GroupwiseServer" ), + const TQString &password, TQObject *parent ) + : TQObject( parent, "GroupwiseServer" ), mUrl( url ), mUser( user ), mPassword( password ), mSSL( url.left(6)=="https:" ), m_sock( 0 ), mError( 0 ) @@ -477,7 +477,7 @@ void GroupwiseServer::dumpFolderList() { mSoap->header->ngwt__session = mSession; _ngwm__getFolderListRequest folderListReq; - folderListReq.tqparent = "folders"; + folderListReq.parent = "folders"; folderListReq.recurse = true; _ngwm__getFolderListResponse folderListRes; soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), 0, @@ -589,7 +589,7 @@ void GroupwiseServer::dumpAppointment( ngwt__Appointment *a ) void GroupwiseServer::dumpFolder( ngwt__Folder *f ) { dumpItem( f ); - kdDebug() << " PARENT: " << f->tqparent.c_str() << endl; + kdDebug() << " PARENT: " << f->parent.c_str() << endl; if ( f->description ) { kdDebug() << " DESCRIPTION: " << f->description->c_str() << endl; } @@ -763,7 +763,7 @@ std::string GroupwiseServer::getFullIDFor( const TQString & gwRecordIDFromIcal ) std::string calendarFolderID; _ngwm__getFolderListRequest folderListReq; _ngwm__getFolderListResponse folderListRes; - folderListReq.tqparent = "folders"; + folderListReq.parent = "folders"; folderListReq.view = soap_new_std__string( mSoap, -1 ); folderListReq.view->append( "id type" ); folderListReq.recurse = false; diff --git a/kresources/groupwise/soap/groupwiseserver.h b/kresources/groupwise/soap/groupwiseserver.h index 373c94e40..2c537661a 100644 --- a/kresources/groupwise/soap/groupwiseserver.h +++ b/kresources/groupwise/soap/groupwiseserver.h @@ -100,7 +100,7 @@ class GroupwiseServer : public TQObject bool checkResponse( int result, ngwt__tqStatus *status ); enum RetractCause { DueToResend, Other }; GroupwiseServer( const TQString &url, const TQString &user, - const TQString &password, TQObject *tqparent ); + const TQString &password, TQObject *parent ); ~GroupwiseServer(); int error() const { return mError; } diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp index 6f5918597..4610b0e2a 100644 --- a/kresources/groupwise/soap/gwjobs.cpp +++ b/kresources/groupwise/soap/gwjobs.cpp @@ -351,7 +351,7 @@ void ReadCalendarJob::run() mSoap->header->ngwt__session = mSession; _ngwm__getFolderListRequest folderListReq; - folderListReq.tqparent = "folders"; + folderListReq.parent = "folders"; folderListReq.view = 0; folderListReq.recurse = true; _ngwm__getFolderListResponse folderListRes; diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp index 30e8bb643..c6fe2a4f6 100644 --- a/kresources/groupwise/soap/ksslsocket.cpp +++ b/kresources/groupwise/soap/ksslsocket.cpp @@ -279,7 +279,7 @@ int KSSLSocket::verifyCertificate() setMetaData("ssl_action", "accept"); } - // Since we're the tqparent, we need to teach the child. + // Since we're the parent, we need to teach the child. setMetaData("ssl_parent_ip", ourIp ); setMetaData("ssl_parent_cert", pc.toString()); diff --git a/kresources/groupwise/soap/patches/utf8_entities.diff b/kresources/groupwise/soap/patches/utf8_entities.diff index 85d7283a2..b8600a9dd 100644 --- a/kresources/groupwise/soap/patches/utf8_entities.diff +++ b/kresources/groupwise/soap/patches/utf8_entities.diff @@ -3,7 +3,7 @@ @@ -6470,7 +6470,11 @@ } #endif - if (c & tqmask) + if (c & mask) - { if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c)) + { + char S[2]; diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp index b446bc4ba..13dd8b841 100644 --- a/kresources/groupwise/soap/soapC.cpp +++ b/kresources/groupwise/soap/soapC.cpp @@ -32680,8 +32680,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__getFolderListResponse(struct soap *s void _ngwm__getFolderListRequest::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->tqparent, SOAP_TYPE_ngwt__uid); - soap_serialize_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->tqparent); + soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->parent, SOAP_TYPE_ngwt__uid); + soap_serialize_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->parent); soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->view, SOAP_TYPE_PointerTongwt__View); soap_serialize_PointerTongwt__View(soap, &((_ngwm__getFolderListRequest*)this)->view); soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->recurse, SOAP_TYPE_bool); @@ -32693,7 +32693,7 @@ void _ngwm__getFolderListRequest::soap_serialize(struct soap *soap) const void _ngwm__getFolderListRequest::soap_default(struct soap *soap) { this->soap = soap; - soap_default_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->tqparent); + soap_default_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->parent); ((_ngwm__getFolderListRequest*)this)->view = NULL; soap_default_bool(soap, &((_ngwm__getFolderListRequest*)this)->recurse); ((_ngwm__getFolderListRequest*)this)->imap = (bool)0; @@ -32717,7 +32717,7 @@ int _ngwm__getFolderListRequest::soap_out(struct soap *soap, const char *tag, in SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFolderListRequest(struct soap *soap, const char *tag, int id, const _ngwm__getFolderListRequest *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFolderListRequest), type); - soap_out_ngwt__uid(soap, "ngwm:tqparent", -1, &(((_ngwm__getFolderListRequest*)a)->tqparent), ""); + soap_out_ngwt__uid(soap, "ngwm:parent", -1, &(((_ngwm__getFolderListRequest*)a)->parent), ""); soap_out_PointerTongwt__View(soap, "ngwm:view", -1, &(((_ngwm__getFolderListRequest*)a)->view), ""); soap_out_bool(soap, "ngwm:recurse", -1, &(((_ngwm__getFolderListRequest*)a)->recurse), ""); soap_out_bool(soap, "ngwm:imap", -1, &(((_ngwm__getFolderListRequest*)a)->imap), ""); @@ -32758,14 +32758,14 @@ SOAP_FMAC3 _ngwm__getFolderListRequest * SOAP_FMAC4 soap_in__ngwm__getFolderList return (_ngwm__getFolderListRequest *)a->soap_in(soap, tag, type); } } - short soap_flag_tqparent1 = 1, soap_flag_view1 = 1, soap_flag_recurse1 = 1, soap_flag_imap1 = 1, soap_flag_nntp1 = 1; + short soap_flag_parent1 = 1, soap_flag_view1 = 1, soap_flag_recurse1 = 1, soap_flag_imap1 = 1, soap_flag_nntp1 = 1; if (soap->body && !*soap->href) { for (;;) { soap->error = SOAP_TAG_MISMATCH; - if (soap_flag_tqparent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_ngwt__uid(soap, "ngwm:tqparent", &(((_ngwm__getFolderListRequest*)a)->tqparent), "ngwt:uid")) - { soap_flag_tqparent1 = 0; + if (soap_flag_parent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_ngwt__uid(soap, "ngwm:parent", &(((_ngwm__getFolderListRequest*)a)->parent), "ngwt:uid")) + { soap_flag_parent1 = 0; continue; } if (soap_flag_view1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) @@ -32796,7 +32796,7 @@ SOAP_FMAC3 _ngwm__getFolderListRequest * SOAP_FMAC4 soap_in__ngwm__getFolderList if (soap->error) return NULL; } - if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent1 || soap_flag_recurse1)) + if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent1 || soap_flag_recurse1)) { soap->error = SOAP_OCCURS; return NULL; } @@ -42744,8 +42744,8 @@ void ngwt__SystemFolder::soap_serialize(struct soap *soap) const soap_serialize_PointerTongwt__FolderACL(soap, &((ngwt__SystemFolder*)this)->acl); soap_embedded(soap, &((ngwt__SystemFolder*)this)->isSharedByMe, SOAP_TYPE_PointerTobool); soap_serialize_PointerTobool(soap, &((ngwt__SystemFolder*)this)->isSharedByMe); - soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid); - soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent); + soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid); + soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent); soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description); soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint); @@ -42780,7 +42780,7 @@ void ngwt__SystemFolder::soap_default(struct soap *soap) ((ngwt__SystemFolder*)this)->folderType = NULL; ((ngwt__SystemFolder*)this)->acl = NULL; ((ngwt__SystemFolder*)this)->isSharedByMe = NULL; - soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent); + soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent); ((ngwt__Folder*)this)->description = NULL; ((ngwt__Folder*)this)->count = NULL; ((ngwt__Folder*)this)->hasUnread = NULL; @@ -42818,7 +42818,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SystemFolder(struct soap *soap, const c soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), ""); soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), ""); /* transient soap skipped */ - soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), ""); + soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), ""); soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), ""); soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), ""); soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), ""); @@ -42865,7 +42865,7 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa return (ngwt__SystemFolder *)a->soap_in(soap, tag, type); } } - short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_isSystemFolder1 = 1, soap_flag_folderType1 = 1, soap_flag_acl1 = 1, soap_flag_isSharedByMe1 = 1; + short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_isSystemFolder1 = 1, soap_flag_folderType1 = 1, soap_flag_acl1 = 1, soap_flag_isSharedByMe1 = 1; if (soap->body && !*soap->href) { for (;;) @@ -42896,9 +42896,9 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa continue; } /* transient soap skipped */ - if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid")) - { soap_flag_tqparent2 = 0; + if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid")) + { soap_flag_parent2 = 0; continue; } if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) @@ -42963,7 +42963,7 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa if (soap->error) return NULL; } - if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2)) + if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2)) { soap->error = SOAP_OCCURS; return NULL; } @@ -44502,8 +44502,8 @@ void ngwt__SharedFolder::soap_serialize(struct soap *soap) const soap_serialize_PointerTobool(soap, &((ngwt__SharedFolder*)this)->isSharedByMe); soap_embedded(soap, &((ngwt__SharedFolder*)this)->isSharedToMe, SOAP_TYPE_PointerTobool); soap_serialize_PointerTobool(soap, &((ngwt__SharedFolder*)this)->isSharedToMe); - soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid); - soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent); + soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid); + soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent); soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description); soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint); @@ -44539,7 +44539,7 @@ void ngwt__SharedFolder::soap_default(struct soap *soap) ((ngwt__SharedFolder*)this)->owner = NULL; ((ngwt__SharedFolder*)this)->isSharedByMe = NULL; ((ngwt__SharedFolder*)this)->isSharedToMe = NULL; - soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent); + soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent); ((ngwt__Folder*)this)->description = NULL; ((ngwt__Folder*)this)->count = NULL; ((ngwt__Folder*)this)->hasUnread = NULL; @@ -44577,7 +44577,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SharedFolder(struct soap *soap, const c soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), ""); soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), ""); /* transient soap skipped */ - soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), ""); + soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), ""); soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), ""); soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), ""); soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), ""); @@ -44625,7 +44625,7 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa return (ngwt__SharedFolder *)a->soap_in(soap, tag, type); } } - short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_rights1 = 1, soap_flag_acl1 = 1, soap_flag_owner1 = 1, soap_flag_isSharedByMe1 = 1, soap_flag_isSharedToMe1 = 1; + short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_rights1 = 1, soap_flag_acl1 = 1, soap_flag_owner1 = 1, soap_flag_isSharedByMe1 = 1, soap_flag_isSharedToMe1 = 1; if (soap->body && !*soap->href) { for (;;) @@ -44656,9 +44656,9 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa continue; } /* transient soap skipped */ - if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid")) - { soap_flag_tqparent2 = 0; + if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid")) + { soap_flag_parent2 = 0; continue; } if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) @@ -44728,7 +44728,7 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa if (soap->error) return NULL; } - if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2)) + if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2)) { soap->error = SOAP_OCCURS; return NULL; } @@ -48314,8 +48314,8 @@ void ngwt__QueryFolder::soap_serialize(struct soap *soap) const soap_serialize_PointerTongwt__FolderType(soap, &((ngwt__QueryFolder*)this)->folderType); soap_embedded(soap, &((ngwt__QueryFolder*)this)->query, SOAP_TYPE_PointerTongwt__Query); soap_serialize_PointerTongwt__Query(soap, &((ngwt__QueryFolder*)this)->query); - soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid); - soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent); + soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid); + soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent); soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description); soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint); @@ -48348,7 +48348,7 @@ void ngwt__QueryFolder::soap_default(struct soap *soap) this->soap = soap; ((ngwt__QueryFolder*)this)->folderType = NULL; ((ngwt__QueryFolder*)this)->query = NULL; - soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent); + soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent); ((ngwt__Folder*)this)->description = NULL; ((ngwt__Folder*)this)->count = NULL; ((ngwt__Folder*)this)->hasUnread = NULL; @@ -48386,7 +48386,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__QueryFolder(struct soap *soap, const ch soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), ""); soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), ""); /* transient soap skipped */ - soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), ""); + soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), ""); soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), ""); soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), ""); soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), ""); @@ -48431,7 +48431,7 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap return (ngwt__QueryFolder *)a->soap_in(soap, tag, type); } } - short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_folderType1 = 1, soap_flag_query1 = 1; + short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_folderType1 = 1, soap_flag_query1 = 1; if (soap->body && !*soap->href) { for (;;) @@ -48462,9 +48462,9 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap continue; } /* transient soap skipped */ - if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid")) - { soap_flag_tqparent2 = 0; + if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid")) + { soap_flag_parent2 = 0; continue; } if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) @@ -48519,7 +48519,7 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap if (soap->error) return NULL; } - if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2)) + if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2)) { soap->error = SOAP_OCCURS; return NULL; } @@ -58496,8 +58496,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__FolderACL(struct soap *soap, int st, void ngwt__Folder::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid); - soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent); + soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid); + soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent); soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description); soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint); @@ -58528,7 +58528,7 @@ void ngwt__Folder::soap_serialize(struct soap *soap) const void ngwt__Folder::soap_default(struct soap *soap) { this->soap = soap; - soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent); + soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent); ((ngwt__Folder*)this)->description = NULL; ((ngwt__Folder*)this)->count = NULL; ((ngwt__Folder*)this)->hasUnread = NULL; @@ -58566,7 +58566,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Folder(struct soap *soap, const char *t soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), ""); soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), ""); /* transient soap skipped */ - soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), ""); + soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), ""); soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), ""); soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), ""); soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), ""); @@ -58609,7 +58609,7 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con return (ngwt__Folder *)a->soap_in(soap, tag, type); } } - short soap_flag_id2 = 1, soap_flag_name2 = 1, soap_flag_version2 = 1, soap_flag_modified2 = 1, soap_flag_changes2 = 1, soap_flag_tqparent1 = 1, soap_flag_description1 = 1, soap_flag_count1 = 1, soap_flag_hasUnread1 = 1, soap_flag_unreadCount1 = 1, soap_flag_sequence1 = 1, soap_flag_settings1 = 1, soap_flag_calendarAttribute1 = 1; + short soap_flag_id2 = 1, soap_flag_name2 = 1, soap_flag_version2 = 1, soap_flag_modified2 = 1, soap_flag_changes2 = 1, soap_flag_parent1 = 1, soap_flag_description1 = 1, soap_flag_count1 = 1, soap_flag_hasUnread1 = 1, soap_flag_unreadCount1 = 1, soap_flag_sequence1 = 1, soap_flag_settings1 = 1, soap_flag_calendarAttribute1 = 1; if (soap->body && !*soap->href) { for (;;) @@ -58640,9 +58640,9 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con continue; } /* transient soap skipped */ - if (soap_flag_tqparent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid")) - { soap_flag_tqparent1 = 0; + if (soap_flag_parent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid")) + { soap_flag_parent1 = 0; continue; } if (soap_flag_description1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) @@ -58687,7 +58687,7 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con if (soap->error) return NULL; } - if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent1)) + if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent1)) { soap->error = SOAP_OCCURS; return NULL; } @@ -63087,8 +63087,8 @@ void ngwt__ContactFolder::soap_serialize(struct soap *soap) const soap_serialize_PointerTongwt__FolderACL(soap, &((ngwt__SystemFolder*)this)->acl); soap_embedded(soap, &((ngwt__SystemFolder*)this)->isSharedByMe, SOAP_TYPE_PointerTobool); soap_serialize_PointerTobool(soap, &((ngwt__SystemFolder*)this)->isSharedByMe); - soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid); - soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent); + soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid); + soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent); soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description); soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint); @@ -63124,7 +63124,7 @@ void ngwt__ContactFolder::soap_default(struct soap *soap) ((ngwt__SystemFolder*)this)->folderType = NULL; ((ngwt__SystemFolder*)this)->acl = NULL; ((ngwt__SystemFolder*)this)->isSharedByMe = NULL; - soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent); + soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent); ((ngwt__Folder*)this)->description = NULL; ((ngwt__Folder*)this)->count = NULL; ((ngwt__Folder*)this)->hasUnread = NULL; @@ -63162,7 +63162,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ContactFolder(struct soap *soap, const soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), ""); soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), ""); /* transient soap skipped */ - soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), ""); + soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), ""); soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), ""); soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), ""); soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), ""); @@ -63210,7 +63210,7 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s return (ngwt__ContactFolder *)a->soap_in(soap, tag, type); } } - short soap_flag_id4 = 1, soap_flag_name4 = 1, soap_flag_version4 = 1, soap_flag_modified4 = 1, soap_flag_changes4 = 1, soap_flag_tqparent3 = 1, soap_flag_description3 = 1, soap_flag_count3 = 1, soap_flag_hasUnread3 = 1, soap_flag_unreadCount3 = 1, soap_flag_sequence3 = 1, soap_flag_settings3 = 1, soap_flag_calendarAttribute3 = 1, soap_flag_isSystemFolder2 = 1, soap_flag_folderType2 = 1, soap_flag_acl2 = 1, soap_flag_isSharedByMe2 = 1, soap_flag_addressBook1 = 1; + short soap_flag_id4 = 1, soap_flag_name4 = 1, soap_flag_version4 = 1, soap_flag_modified4 = 1, soap_flag_changes4 = 1, soap_flag_parent3 = 1, soap_flag_description3 = 1, soap_flag_count3 = 1, soap_flag_hasUnread3 = 1, soap_flag_unreadCount3 = 1, soap_flag_sequence3 = 1, soap_flag_settings3 = 1, soap_flag_calendarAttribute3 = 1, soap_flag_isSystemFolder2 = 1, soap_flag_folderType2 = 1, soap_flag_acl2 = 1, soap_flag_isSharedByMe2 = 1, soap_flag_addressBook1 = 1; if (soap->body && !*soap->href) { for (;;) @@ -63241,9 +63241,9 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s continue; } /* transient soap skipped */ - if (soap_flag_tqparent3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid")) - { soap_flag_tqparent3 = 0; + if (soap_flag_parent3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid")) + { soap_flag_parent3 = 0; continue; } if (soap_flag_description3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) @@ -63313,7 +63313,7 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s if (soap->error) return NULL; } - if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent3)) + if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent3)) { soap->error = SOAP_OCCURS; return NULL; } diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h index 829237fda..46461d08e 100644 --- a/kresources/groupwise/soap/soapStub.h +++ b/kresources/groupwise/soap/soapStub.h @@ -18,25 +18,25 @@ #ifndef SOAP_TYPE_ngwt__ItemSourceList #define SOAP_TYPE_ngwt__ItemSourceList (336) -/* Bitqmask ngwt:ItemSourceList */ +/* Bimask ngwt:ItemSourceList */ enum ngwt__ItemSourceList {received = 1, sent = 2, draft = 4, personal = 8}; #endif #ifndef SOAP_TYPE_ngwt__MessageTypeList #define SOAP_TYPE_ngwt__MessageTypeList (337) -/* Bitqmask ngwt:MessageTypeList */ +/* Bimask ngwt:MessageTypeList */ enum ngwt__MessageTypeList {Appointment = 1, CalendarItem = 2, DocumentReference = 4, Mail = 8, Note = 16, PhoneMessage = 32, Task = 64}; #endif #ifndef SOAP_TYPE_ngwe__FieldList #define SOAP_TYPE_ngwe__FieldList (339) -/* Bitqmask ngwe:FieldList */ +/* Bimask ngwe:FieldList */ enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipientqStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456}; #endif #ifndef SOAP_TYPE_ngwe__ItemTypeList #define SOAP_TYPE_ngwe__ItemTypeList (340) -/* Bitqmask ngwe:ItemTypeList */ +/* Bimask ngwe:ItemTypeList */ enum ngwe__ItemTypeList {AddressBookItem = 1, Appointment_ = 2, CalendarItem_ = 4, Contact_ = 8, Group = 16, Mail_ = 32, Note_ = 64, Organization_ = 128, PhoneMessage_ = 256, Resource = 512, Task_ = 1024, DocumentRef = 2048}; #endif @@ -3541,7 +3541,7 @@ public: class SOAP_CMAC _ngwm__getFolderListRequest { public: - std::string tqparent; /* required element of type ngwt:uid */ + std::string parent; /* required element of type ngwt:uid */ public: std::string *view; /* optional element of type ngwt:View */ bool recurse; /* required element of type xsd:boolean */ @@ -6545,7 +6545,7 @@ public: class SOAP_CMAC ngwt__Folder : public ngwt__Item { public: - std::string tqparent; /* required element of type ngwt:uid */ + std::string parent; /* required element of type ngwt:uid */ public: std::string *description; /* optional element of type xsd:string */ int *count; /* optional element of type xsd:int */ diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp index dd43419b0..dd2ac0103 100644 --- a/kresources/groupwise/soap/stdsoap2.cpp +++ b/kresources/groupwise/soap/stdsoap2.cpp @@ -3316,7 +3316,7 @@ again: { short v; unsigned int k = soap->omode; /* make sure we only parse HTTP */ size_t n = soap->count; /* save the content length */ - soap->omode &= ~SOAP_ENC; /* tqmask IO and ENC */ + soap->omode &= ~SOAP_ENC; /* mask IO and ENC */ soap->omode |= SOAP_IO_BUFFER; soap_begin_send(soap); DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connecting to proxy server\n")); @@ -3337,7 +3337,7 @@ again: return SOAP_INVALID_SOCKET; soap->omode = k; k = soap->imode; - soap->imode &= ~SOAP_ENC; /* tqmask IO and ENC */ + soap->imode &= ~SOAP_ENC; /* mask IO and ENC */ v = soap->version; /* preserve */ if (soap_begin_recv(soap)) return SOAP_INVALID_SOCKET; @@ -6957,7 +6957,7 @@ SOAP_FMAC2 soap_string_out(struct soap *soap, const char *s, int flag) { register const char *t; register soap_wchar c; - register soap_wchar tqmask = 0xFFFFFF80UL; + register soap_wchar mask = 0xFFFFFF80UL; #ifdef WITH_DOM if ((soap->mode & SOAP_XML_DOM) && soap->dom) { soap->dom->data = soap_strdup(soap, s); /* check EOM */ @@ -6965,7 +6965,7 @@ soap_string_out(struct soap *soap, const char *s, int flag) } #endif if (soap->mode & SOAP_C_UTFSTRING) - tqmask = 0; + mask = 0; t = s; while ((c = *t++)) { switch (c) @@ -7028,7 +7028,7 @@ soap_string_out(struct soap *soap, const char *s, int flag) } #endif #endif - if (c & tqmask) + if (c & mask) { if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c)) return soap->error; s = t; diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h index 603d4def9..7dee722a1 100644 --- a/kresources/groupwise/soap/stdsoap2.h +++ b/kresources/groupwise/soap/stdsoap2.h @@ -896,7 +896,7 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan; typedef soap_int32 soap_mode; -#define SOAP_IO 0x00000003 /* IO tqmask */ +#define SOAP_IO 0x00000003 /* IO mask */ #define SOAP_IO_FLUSH 0x00000000 /* flush output immediately, no buffering */ #define SOAP_IO_BUFFER 0x00000001 /* buffer output in packets of size SOAP_BUFLEN */ #define SOAP_IO_STORE 0x00000002 /* store entire output to determine length for transport */ @@ -914,7 +914,7 @@ typedef soap_int32 soap_mode; #define SOAP_ENC_ZLIB 0x00000400 #define SOAP_ENC_SSL 0x00000800 -#define SOAP_ENC 0x00000FFF /* IO and ENC tqmask */ +#define SOAP_ENC 0x00000FFF /* IO and ENC mask */ #define SOAP_XML_STRICT 0x00001000 /* strict validation */ #define SOAP_XML_CANONICAL 0x00002000 /* C14N canonical XML */ @@ -1236,7 +1236,7 @@ class soap_dom_iterator #ifndef WITH_LEANER struct soap_dom_element { struct soap_dom_element *next; /* next sibling */ - struct soap_dom_element *prnt; /* tqparent */ + struct soap_dom_element *prnt; /* parent */ struct soap_dom_element *elts; /* first child element */ struct soap_dom_attribute *atts; /* first child attribute */ const char *nstr; /* namespace string */ diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp index ff19fb50d..438696412 100644 --- a/kresources/kolab/kabc/resourcekolab.cpp +++ b/kresources/kolab/kabc/resourcekolab.cpp @@ -668,9 +668,9 @@ void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, boo /*virtual*/ -bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& tqparent ) +bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& parent ) { - return kmailAddSubresource( label, tqparent, s_kmailContentsType ); + return kmailAddSubresource( label, parent, s_kmailContentsType ); } /*virtual*/ diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp index 2107642b6..04db68a6e 100644 --- a/kresources/kolab/kcal/resourcekolab.cpp +++ b/kresources/kolab/kcal/resourcekolab.cpp @@ -920,7 +920,7 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms while ( it != alarms.end() ) { KCal::Alarm *a = (*it); ++it; - const TQString &uid = a->tqparent()->uid(); + const TQString &uid = a->parent()->uid(); if ( mUidMap.contains( uid ) ) { const TQString &sr = mUidMap[ uid ].resource(); Kolab::SubResource *subResource = 0; @@ -1231,16 +1231,16 @@ Kolab::ResourceMap* ResourceKolab::subResourceMap( const TQString& contentsType /*virtual*/ -bool ResourceKolab::addSubresource( const TQString& resource, const TQString& tqparent ) +bool ResourceKolab::addSubresource( const TQString& resource, const TQString& parent ) { kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl; TQString contentsType = kmailCalendarContentsType; - if ( !tqparent.isEmpty() ) { - if ( mEventSubResources.contains( tqparent ) ) + if ( !parent.isEmpty() ) { + if ( mEventSubResources.contains( parent ) ) contentsType = kmailCalendarContentsType; - else if ( mTodoSubResources.contains( tqparent ) ) + else if ( mTodoSubResources.contains( parent ) ) contentsType = kmailTodoContentsType; - else if ( mJournalSubResources.contains( tqparent ) ) + else if ( mJournalSubResources.contains( parent ) ) contentsType = kmailJournalContentsType; } else { TQStringList contentTypeChoices; @@ -1255,7 +1255,7 @@ bool ResourceKolab::addSubresource( const TQString& resource, const TQString& tq contentsType = kmailJournalContentsType; } - return kmailAddSubresource( resource, tqparent, contentsType ); + return kmailAddSubresource( resource, parent, contentsType ); } /*virtual*/ diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h index 1535403a6..872fbda4c 100644 --- a/kresources/kolab/kcal/resourcekolab.h +++ b/kresources/kolab/kcal/resourcekolab.h @@ -140,7 +140,7 @@ public: virtual TQString subresourceIdentifier( Incidence *incidence ); - virtual bool addSubresource( const TQString& resource, const TQString& tqparent ); + virtual bool addSubresource( const TQString& resource, const TQString& parent ); virtual bool removeSubresource( const TQString& resource ); virtual TQString subresourceType( const TQString &resource ); diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp index 7bf5a601c..570bb47bc 100644 --- a/kresources/kolab/kcal/task.cpp +++ b/kresources/kolab/kcal/task.cpp @@ -141,7 +141,7 @@ void Task::setParent( const TQString& parentUid ) mParent = parentUid; } -TQString Task::tqparent() const +TQString Task::parent() const { return mParent; } @@ -247,7 +247,7 @@ bool Task::loadAttribute( TQDomElement& element ) setqStatus( KCal::Incidence::StatusNone ); } else if ( tagName == "due-date" ) { setDueDate( element.text() ); - } else if ( tagName == "tqparent" ) { + } else if ( tagName == "parent" ) { setParent( element.text() ); } else if ( tagName == "x-completed-date" ) { setCompletedDate( stringToDateTime( element.text() ) ); @@ -307,8 +307,8 @@ bool Task::saveAttributes( TQDomElement& element ) const } } - if ( !tqparent().isNull() ) { - writeString( element, "tqparent", tqparent() ); + if ( !parent().isNull() ) { + writeString( element, "parent", parent() ); } if ( hasCompletedDate() && percentCompleted() == 100 ) { @@ -453,8 +453,8 @@ void Task::saveTo( KCal::Todo* task ) if ( hasDueDate() ) task->setDtDue( utcToLocal( dueDate() ) ); - if ( !tqparent().isNull() ) - task->setRelatedToUid( tqparent() ); + if ( !parent().isNull() ) + task->setRelatedToUid( parent() ); if ( hasCompletedDate() && task->percentComplete() == 100 ) task->setCompleted( utcToLocal( mCompletedDate ) ); diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h index 5990192b9..43780c00e 100644 --- a/kresources/kolab/kcal/task.h +++ b/kresources/kolab/kcal/task.h @@ -81,7 +81,7 @@ public: virtual KCal::Incidence::tqStatus status() const; virtual void setParent( const TQString& parentUid ); - virtual TQString tqparent() const; + virtual TQString parent() const; virtual void setHasStartDate( bool ); virtual bool hasStartDate() const; diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp index 8e584fb2a..e82102a34 100644 --- a/kresources/kolab/shared/kmailconnection.cpp +++ b/kresources/kolab/shared/kmailconnection.cpp @@ -295,11 +295,11 @@ bool KMailConnection::kmailUpdate( const TQString& resource, } bool KMailConnection::kmailAddSubresource( const TQString& resource, - const TQString& tqparent, + const TQString& parent, const TQString& contentsType ) { return connectToKMail() - && mKMailIcalIfaceStub->addSubresource( resource, tqparent, contentsType ) + && mKMailIcalIfaceStub->addSubresource( resource, parent, contentsType ) && mKMailIcalIfaceStub->ok(); } diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h index b7befb4de..ec49bfd11 100644 --- a/kresources/kolab/shared/kmailconnection.h +++ b/kresources/kolab/shared/kmailconnection.h @@ -108,7 +108,7 @@ public: bool kmailTriggerSync( const TQString& contentsType ); bool kmailAddSubresource( const TQString& resource, - const TQString& tqparent, + const TQString& parent, const TQString& contentsType ); bool kmailRemoveSubresource( const TQString& resource ); diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp index 90464b6b0..a357b0d62 100644 --- a/kresources/kolab/shared/resourcekolabbase.cpp +++ b/kresources/kolab/shared/resourcekolabbase.cpp @@ -199,10 +199,10 @@ bool ResourceKolabBase::connectToKMail() const } bool ResourceKolabBase::kmailAddSubresource( const TQString& resource, - const TQString& tqparent, + const TQString& parent, const TQString& contentsType ) { - return mConnection->kmailAddSubresource( resource, tqparent, contentsType ); + return mConnection->kmailAddSubresource( resource, parent, contentsType ); } bool ResourceKolabBase::kmailRemoveSubresource( const TQString& resource ) diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h index d16f2a576..f32c151fd 100644 --- a/kresources/kolab/shared/resourcekolabbase.h +++ b/kresources/kolab/shared/resourcekolabbase.h @@ -162,7 +162,7 @@ protected: const TQStringList& attachmentNames = TQStringList(), const TQStringList& deletedAttachments = TQStringList() ); - bool kmailAddSubresource( const TQString& resource, const TQString& tqparent, + bool kmailAddSubresource( const TQString& resource, const TQString& parent, const TQString& contentsType ); bool kmailRemoveSubresource( const TQString& resource ); diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp index f5af726ac..20fa6fa1b 100644 --- a/kresources/lib/folderconfig.cpp +++ b/kresources/lib/folderconfig.cpp @@ -41,8 +41,8 @@ using namespace KPIM; -FolderConfig::FolderConfig( TQWidget *tqparent ) - : TQWidget( tqparent ), mFolderLister( 0 ) +FolderConfig::FolderConfig( TQWidget *parent ) + : TQWidget( parent ), mFolderLister( 0 ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->addSpacing( KDialog::spacingHint() ); diff --git a/kresources/lib/folderconfig.h b/kresources/lib/folderconfig.h index 538c1b478..6ed2ae591 100644 --- a/kresources/lib/folderconfig.h +++ b/kresources/lib/folderconfig.h @@ -40,7 +40,7 @@ class KDE_EXPORT FolderConfig : public TQWidget Q_OBJECT TQ_OBJECT public: - FolderConfig( TQWidget *tqparent ); + FolderConfig( TQWidget *parent ); ~FolderConfig(); void setFolderLister( FolderLister * ); diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp index d8ae7ec13..8cbdffd5e 100644 --- a/kresources/lib/folderlistview.cpp +++ b/kresources/lib/folderlistview.cpp @@ -38,8 +38,8 @@ static const int BoxSize = 16; //BEGIN FolderListView -FolderListView::FolderListView( TQWidget *tqparent, const TQValueList<Property> &types ) - : KListView( tqparent ) +FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &types ) + : KListView( parent ) { setEnabledTypes( types ); diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h index 0c99d913c..1992f8bff 100644 --- a/kresources/lib/folderlistview.h +++ b/kresources/lib/folderlistview.h @@ -46,7 +46,7 @@ class FolderListView : public KListView /* mainly for readability */ enum Property { FolderName, Event, Todo, Journal, Contact, All, Unknown, PROP_MAX }; - FolderListView( TQWidget *tqparent, const TQValueList<Property> &types = TQValueList<Property>() ); + FolderListView( TQWidget *parent, const TQValueList<Property> &types = TQValueList<Property>() ); ~FolderListView() {}; /* Display a popupmenu for item i at the specified global position, eventually with a title, @@ -82,9 +82,9 @@ class FolderListItem : public TQCheckListItem { typedef TQCheckListItem super; public: - FolderListItem( FolderListItem *tqparent, const KPIM::FolderLister::Entry &folder ) - : TQCheckListItem( tqparent, folder.name, TQCheckListItem::CheckBoxController ), - mFolder( folder ), mFolderListView( tqparent?(tqparent->folderListView()):0 ) + FolderListItem( FolderListItem *parent, const KPIM::FolderLister::Entry &folder ) + : TQCheckListItem( parent, folder.name, TQCheckListItem::CheckBoxController ), + mFolder( folder ), mFolderListView( parent?(parent->folderListView()):0 ) { setOn( mFolder.active ); } diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp index ba16ccae8..803037342 100644 --- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp +++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp @@ -37,8 +37,8 @@ using namespace KABC; -ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() ); diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.h b/kresources/lib/kabc_resourcegroupwarebaseconfig.h index 59c99f486..dbb57ed65 100644 --- a/kresources/lib/kabc_resourcegroupwarebaseconfig.h +++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.h @@ -42,7 +42,7 @@ class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceGroupwareBaseConfig( TQWidget* tqparent = 0, const char* name = 0 ); + ResourceGroupwareBaseConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp index 0d7e4248d..808a16734 100644 --- a/kresources/lib/kcal_cachesettingsdlg.cpp +++ b/kresources/lib/kcal_cachesettingsdlg.cpp @@ -38,8 +38,8 @@ using namespace KCal; -CacheSettingsDialog::CacheSettingsDialog( TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n("Resource Cache Settings"), KDialogBase::Close ) +CacheSettingsDialog::CacheSettingsDialog( TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n("Resource Cache Settings"), KDialogBase::Close ) { TQWidget *mainWidget = new TQWidget( this ); setMainWidget( mainWidget ); diff --git a/kresources/lib/kcal_cachesettingsdlg.h b/kresources/lib/kcal_cachesettingsdlg.h index 07e8337f6..3de47e9a8 100644 --- a/kresources/lib/kcal_cachesettingsdlg.h +++ b/kresources/lib/kcal_cachesettingsdlg.h @@ -44,7 +44,7 @@ class KDE_EXPORT CacheSettingsDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - CacheSettingsDialog( TQWidget *tqparent = 0, const char *name = 0 ); + CacheSettingsDialog( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp index e3fc3f93e..9ae91a0d8 100644 --- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp +++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp @@ -42,9 +42,9 @@ using namespace KCal; -ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* tqparent, +ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) + : KRES::ConfigWidget( parent, name ) { resize( 245, 115 ); diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.h b/kresources/lib/kcal_resourcegroupwarebaseconfig.h index ee10fa5c1..eb2522ecc 100644 --- a/kresources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.h @@ -49,7 +49,7 @@ class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - ResourceGroupwareBaseConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceGroupwareBaseConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/kresources/remote/resourceremoteconfig.cpp b/kresources/remote/resourceremoteconfig.cpp index 7ecb09836..67d7f4b94 100644 --- a/kresources/remote/resourceremoteconfig.cpp +++ b/kresources/remote/resourceremoteconfig.cpp @@ -38,8 +38,8 @@ using namespace KCal; -ResourceRemoteConfig::ResourceRemoteConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceRemoteConfig::ResourceRemoteConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 ); diff --git a/kresources/remote/resourceremoteconfig.h b/kresources/remote/resourceremoteconfig.h index 7fe6e862e..7c7d5124a 100644 --- a/kresources/remote/resourceremoteconfig.h +++ b/kresources/remote/resourceremoteconfig.h @@ -47,7 +47,7 @@ class KDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - ResourceRemoteConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceRemoteConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp index 70ab3734c..d0a9644e8 100644 --- a/kresources/scalix/scalixadmin/delegatedialog.cpp +++ b/kresources/scalix/scalixadmin/delegatedialog.cpp @@ -31,8 +31,8 @@ #include "delegatedialog.h" -DelegateDialog::DelegateDialog( TQWidget *tqparent ) - : KDialogBase( tqparent, "", true, "", Ok | Cancel, Ok, true ) +DelegateDialog::DelegateDialog( TQWidget *parent ) + : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true ) { TQWidget *page = new TQWidget( this ); TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 ); diff --git a/kresources/scalix/scalixadmin/delegatedialog.h b/kresources/scalix/scalixadmin/delegatedialog.h index a515fe890..6b3d78514 100644 --- a/kresources/scalix/scalixadmin/delegatedialog.h +++ b/kresources/scalix/scalixadmin/delegatedialog.h @@ -38,7 +38,7 @@ class DelegateDialog : public KDialogBase TQ_OBJECT public: - DelegateDialog( TQWidget *tqparent = 0 ); + DelegateDialog( TQWidget *parent = 0 ); void setDelegate( const Scalix::Delegate &delegate ); Scalix::Delegate delegate() const; diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp index cdfef5916..32b29d465 100644 --- a/kresources/scalix/scalixadmin/delegatepage.cpp +++ b/kresources/scalix/scalixadmin/delegatepage.cpp @@ -34,8 +34,8 @@ #include "delegatepage.h" -DelegatePage::DelegatePage( TQWidget *tqparent ) - : TQWidget( tqparent ) +DelegatePage::DelegatePage( TQWidget *parent ) + : TQWidget( parent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 ); diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/kresources/scalix/scalixadmin/delegatepage.h index 3d266580e..26afbad84 100644 --- a/kresources/scalix/scalixadmin/delegatepage.h +++ b/kresources/scalix/scalixadmin/delegatepage.h @@ -34,7 +34,7 @@ class DelegatePage : public TQWidget TQ_OBJECT public: - DelegatePage( TQWidget *tqparent = 0 ); + DelegatePage( TQWidget *parent = 0 ); ~DelegatePage(); private slots: diff --git a/kresources/scalix/scalixadmin/delegateview.cpp b/kresources/scalix/scalixadmin/delegateview.cpp index 12f27b770..1031f460e 100644 --- a/kresources/scalix/scalixadmin/delegateview.cpp +++ b/kresources/scalix/scalixadmin/delegateview.cpp @@ -27,8 +27,8 @@ class DelegateItem : public TQListViewItem { public: - DelegateItem( TQListView *tqparent, const Scalix::Delegate &delegate ) - : TQListViewItem( tqparent ), mDelegate( delegate ) + DelegateItem( TQListView *parent, const Scalix::Delegate &delegate ) + : TQListViewItem( parent ), mDelegate( delegate ) { setText( 0, mDelegate.email() ); setText( 1, Scalix::Delegate::rightsAsString( mDelegate.rights() ) ); @@ -40,8 +40,8 @@ class DelegateItem : public TQListViewItem Scalix::Delegate mDelegate; }; -DelegateView::DelegateView( DelegateManager *manager, TQWidget *tqparent ) - : KListView( tqparent ), mManager( manager ) +DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent ) + : KListView( parent ), mManager( manager ) { addColumn( i18n( "Delegate" ) ); addColumn( i18n( "Rights" ) ); diff --git a/kresources/scalix/scalixadmin/delegateview.h b/kresources/scalix/scalixadmin/delegateview.h index 243d3c8dc..ec8f1fe26 100644 --- a/kresources/scalix/scalixadmin/delegateview.h +++ b/kresources/scalix/scalixadmin/delegateview.h @@ -35,7 +35,7 @@ class DelegateView : public KListView TQ_OBJECT public: - DelegateView( DelegateManager *manager, TQWidget *tqparent = 0 ); + DelegateView( DelegateManager *manager, TQWidget *parent = 0 ); Scalix::Delegate selectedDelegate() const; diff --git a/kresources/scalix/scalixadmin/ldapdialog.cpp b/kresources/scalix/scalixadmin/ldapdialog.cpp index 35f5d1c04..6af08c4d7 100644 --- a/kresources/scalix/scalixadmin/ldapdialog.cpp +++ b/kresources/scalix/scalixadmin/ldapdialog.cpp @@ -24,8 +24,8 @@ #include "ldapdialog.h" -LdapDialog::LdapDialog( TQWidget *tqparent ) - : KDialogBase( tqparent, "", true, "", Ok | Cancel, Ok, true ) +LdapDialog::LdapDialog( TQWidget *parent ) + : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true ) { setCaption( i18n( "User Account Selection" ) ); diff --git a/kresources/scalix/scalixadmin/ldapdialog.h b/kresources/scalix/scalixadmin/ldapdialog.h index bcccd2802..9d822af19 100644 --- a/kresources/scalix/scalixadmin/ldapdialog.h +++ b/kresources/scalix/scalixadmin/ldapdialog.h @@ -27,7 +27,7 @@ class LdapView; class LdapDialog : public KDialogBase { public: - LdapDialog( TQWidget *tqparent = 0 ); + LdapDialog( TQWidget *parent = 0 ); TQString selectedUser() const; diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp index bade9e16b..b52c0aad9 100644 --- a/kresources/scalix/scalixadmin/ldapview.cpp +++ b/kresources/scalix/scalixadmin/ldapview.cpp @@ -29,8 +29,8 @@ class LdapItem : public TQListViewItem { public: - LdapItem( TQListView *tqparent, const TQString &text, const TQString &email ) - : TQListViewItem( tqparent ) + LdapItem( TQListView *parent, const TQString &text, const TQString &email ) + : TQListViewItem( parent ) { setText( 0, text ); setText( 1, email ); @@ -38,8 +38,8 @@ class LdapItem : public TQListViewItem }; -LdapView::LdapView( TQWidget *tqparent ) - : KListView( tqparent ) +LdapView::LdapView( TQWidget *parent ) + : KListView( parent ) { addColumn( i18n( "User" ) ); setFullWidth( true ); diff --git a/kresources/scalix/scalixadmin/ldapview.h b/kresources/scalix/scalixadmin/ldapview.h index 8d7375da4..d666726aa 100644 --- a/kresources/scalix/scalixadmin/ldapview.h +++ b/kresources/scalix/scalixadmin/ldapview.h @@ -33,7 +33,7 @@ class LdapView : public KListView TQ_OBJECT public: - LdapView( TQWidget *tqparent = 0 ); + LdapView( TQWidget *parent = 0 ); ~LdapView(); TQString selectedUser() const; diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp index 6aba51c7c..ab5a417a9 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.cpp +++ b/kresources/scalix/scalixadmin/otheruserpage.cpp @@ -37,8 +37,8 @@ #include "otheruserpage.h" -OtherUserPage::OtherUserPage( TQWidget *tqparent ) - : TQWidget( tqparent ) +OtherUserPage::OtherUserPage( TQWidget *parent ) + : TQWidget( parent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 ); diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/kresources/scalix/scalixadmin/otheruserpage.h index f547c078e..b3333197a 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.h +++ b/kresources/scalix/scalixadmin/otheruserpage.h @@ -34,7 +34,7 @@ class OtherUserPage : public TQWidget TQ_OBJECT public: - OtherUserPage( TQWidget *tqparent = 0 ); + OtherUserPage( TQWidget *parent = 0 ); ~OtherUserPage(); private slots: diff --git a/kresources/scalix/scalixadmin/otheruserview.cpp b/kresources/scalix/scalixadmin/otheruserview.cpp index 7b07612c3..25a694287 100644 --- a/kresources/scalix/scalixadmin/otheruserview.cpp +++ b/kresources/scalix/scalixadmin/otheruserview.cpp @@ -27,8 +27,8 @@ class OtherUserItem : public TQListViewItem { public: - OtherUserItem( TQListView *tqparent, const TQString &user ) - : TQListViewItem( tqparent ), mUser( user ) + OtherUserItem( TQListView *parent, const TQString &user ) + : TQListViewItem( parent ), mUser( user ) { setText( 0, mUser ); } @@ -39,8 +39,8 @@ class OtherUserItem : public TQListViewItem TQString mUser; }; -OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *tqparent ) - : KListView( tqparent ), mManager( manager ) +OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent ) + : KListView( parent ), mManager( manager ) { addColumn( i18n( "Registered Accounts" ) ); setFullWidth( true ); diff --git a/kresources/scalix/scalixadmin/otheruserview.h b/kresources/scalix/scalixadmin/otheruserview.h index 36f5923b8..4f0170eba 100644 --- a/kresources/scalix/scalixadmin/otheruserview.h +++ b/kresources/scalix/scalixadmin/otheruserview.h @@ -31,7 +31,7 @@ class OtherUserView : public KListView TQ_OBJECT public: - OtherUserView( OtherUserManager *manager, TQWidget *tqparent = 0 ); + OtherUserView( OtherUserManager *manager, TQWidget *parent = 0 ); TQString selectedUser() const; diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp index 7b2f2ac60..401d4de18 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.cpp +++ b/kresources/scalix/scalixadmin/outofofficepage.cpp @@ -33,8 +33,8 @@ #include "outofofficepage.h" -OutOfOfficePage::OutOfOfficePage( TQWidget *tqparent ) - : TQWidget( tqparent ) +OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) + : TQWidget( parent ) { TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 ); diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/kresources/scalix/scalixadmin/outofofficepage.h index 8e536b287..ee8ba1764 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.h +++ b/kresources/scalix/scalixadmin/outofofficepage.h @@ -34,7 +34,7 @@ class OutOfOfficePage : public TQWidget TQ_OBJECT public: - OutOfOfficePage( TQWidget *tqparent = 0 ); + OutOfOfficePage( TQWidget *parent = 0 ); ~OutOfOfficePage(); private slots: diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp index 0781e3a41..51b11f6ff 100644 --- a/kresources/scalix/scalixadmin/passwordpage.cpp +++ b/kresources/scalix/scalixadmin/passwordpage.cpp @@ -35,8 +35,8 @@ #include "passwordpage.h" -PasswordPage::PasswordPage( TQWidget *tqparent ) - : TQWidget( tqparent ), mJob( 0 ) +PasswordPage::PasswordPage( TQWidget *parent ) + : TQWidget( parent ), mJob( 0 ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 ); diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/kresources/scalix/scalixadmin/passwordpage.h index a461a086a..5961ffe21 100644 --- a/kresources/scalix/scalixadmin/passwordpage.h +++ b/kresources/scalix/scalixadmin/passwordpage.h @@ -36,7 +36,7 @@ class PasswordPage : public TQWidget TQ_OBJECT public: - PasswordPage( TQWidget *tqparent = 0 ); + PasswordPage( TQWidget *parent = 0 ); private slots: void buttonClicked(); diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp index ba3d41156..36b6cc99a 100644 --- a/kresources/slox/kabcresourceslox.cpp +++ b/kresources/slox/kabcresourceslox.cpp @@ -631,14 +631,14 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop } } -void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &tqparent, +void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &parent, const TQString &prefix, const KABC::Address &addr ) { - WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( Street ), addr.street() ); - WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( PostalCode ), addr.postalCode() ); - WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( City ), addr.locality() ); - WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( State ), addr.region() ); - WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( Country ), addr.country() ); + WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Street ), addr.street() ); + WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( PostalCode ), addr.postalCode() ); + WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( City ), addr.locality() ); + WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( State ), addr.region() ); + WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Country ), addr.country() ); } void ResourceSlox::slotProgress( KIO::Job *job, unsigned long percent ) diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h index d7d3417f7..98be4bd5e 100644 --- a/kresources/slox/kabcresourceslox.h +++ b/kresources/slox/kabcresourceslox.h @@ -81,7 +81,7 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase void parseContactAttribute( const TQDomElement &e, Addressee &a ); void createAddresseeFields( TQDomDocument &doc, TQDomElement &prop, const Addressee &a ); - void createAddressFields( TQDomDocument &doc, TQDomElement &tqparent, + void createAddressFields( TQDomDocument &doc, TQDomElement &parent, const TQString &prefix, const KABC::Address &addr ); void uploadContacts(); diff --git a/kresources/slox/kabcresourcesloxconfig.cpp b/kresources/slox/kabcresourcesloxconfig.cpp index d6760156b..abacaf718 100644 --- a/kresources/slox/kabcresourcesloxconfig.cpp +++ b/kresources/slox/kabcresourcesloxconfig.cpp @@ -39,8 +39,8 @@ using namespace KABC; -ResourceSloxConfig::ResourceSloxConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ), mRes( 0 ) +ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ), mRes( 0 ) { TQGridLayout *mainLayout = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() ); diff --git a/kresources/slox/kabcresourcesloxconfig.h b/kresources/slox/kabcresourcesloxconfig.h index 2392d5cc7..79b255a1c 100644 --- a/kresources/slox/kabcresourcesloxconfig.h +++ b/kresources/slox/kabcresourcesloxconfig.h @@ -38,7 +38,7 @@ class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceSloxConfig( TQWidget* tqparent = 0, const char* name = 0 ); + ResourceSloxConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp index cb477038c..b2c24b8ab 100644 --- a/kresources/slox/kcalresourceslox.cpp +++ b/kresources/slox/kcalresourceslox.cpp @@ -393,17 +393,17 @@ void KCalResourceSlox::uploadIncidences() } void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc, - TQDomElement &tqparent, + TQDomElement &parent, Incidence *incidence ) { - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( IncidenceTitle ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( IncidenceTitle ), incidence->summary() ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Description ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( Description ), incidence->description() ); if ( incidence->attendeeCount() > 0 ) { - TQDomElement members = WebdavHandler::addSloxElement( this, doc, tqparent, + TQDomElement members = WebdavHandler::addSloxElement( this, doc, parent, fieldName( Participants ) ); Attendee::List attendees = incidence->attendees(); Attendee::List::ConstIterator it; @@ -428,62 +428,62 @@ void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc, // TODO OX support if ( incidence->secrecy() == Incidence::SecrecyPublic && type() != "ox" ) { - TQDomElement rights = WebdavHandler::addSloxElement( this, doc, tqparent, "readrights" ); + TQDomElement rights = WebdavHandler::addSloxElement( this, doc, parent, "readrights" ); WebdavHandler::addSloxElement( this, doc, rights, "group", "users" ); } // set reminder as the number of minutes to the start of the event KCal::Alarm::List alarms = incidence->alarms(); if ( !alarms.isEmpty() && alarms.first()->hasStartOffset() && alarms.first()->enabled() ) - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Reminder ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( Reminder ), TQString::number( (-1) * alarms.first()->startOffset().asSeconds() / 60 ) ); else - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Reminder ), "0" ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( Reminder ), "0" ); // categories - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Categories ), incidence->categories().join( ", " ) ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( Categories ), incidence->categories().join( ", " ) ); } void KCalResourceSlox::createEventAttributes( TQDomDocument &doc, - TQDomElement &tqparent, + TQDomElement &parent, Event *event ) { TQString folderId = mPrefs->calendarFolderId(); if ( folderId.isEmpty() && type() == "ox" ) // SLOX and OX use diffrent default folders folderId = "-1"; - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FolderId ), folderId ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( FolderId ), folderId ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( EventBegin ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( EventBegin ), WebdavHandler::qDateTimeToSlox( event->dtStart(), timeZoneId() ) ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( EventEnd ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( EventEnd ), WebdavHandler::qDateTimeToSlox( event->dtEnd(), timeZoneId() ) ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Location ), event->location() ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( Location ), event->location() ); if ( event->doesFloat() ) { - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FullTime ), boolToStr( true ) ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( FullTime ), boolToStr( true ) ); } else { - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FullTime ), boolToStr( false ) ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( FullTime ), boolToStr( false ) ); } } void KCalResourceSlox::createTodoAttributes( TQDomDocument &doc, - TQDomElement &tqparent, + TQDomElement &parent, Todo *todo ) { TQString folderId = mPrefs->taskFolderId(); if ( folderId.isEmpty() && type() == "ox" ) // SLOX and OX use diffrent default folders folderId = "-1"; - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FolderId ), folderId ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( FolderId ), folderId ); if ( todo->hasStartDate() ) { - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( TaskBegin ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( TaskBegin ), WebdavHandler::qDateTimeToSlox( todo->dtStart(), timeZoneId() ) ); } if ( todo->hasDueDate() ) { - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( TaskEnd ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( TaskEnd ), WebdavHandler::qDateTimeToSlox( todo->dtDue(), timeZoneId() ) ); } @@ -502,18 +502,18 @@ void KCalResourceSlox::createTodoAttributes( TQDomDocument &doc, txt = "2"; break; } - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Priority ), txt ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( Priority ), txt ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( PercentComplete ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( PercentComplete ), TQString::number( todo->percentComplete() ) ); } void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc, - TQDomElement &tqparent, + TQDomElement &parent, KCal::Incidence *incidence ) { if ( !incidence->doesRecur() ) { - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), type() == "ox" ? "none" : "no" ); return; } @@ -521,13 +521,13 @@ void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc, int monthOffset = ( type() == "ox" ? -1 : 0 ); switch ( r->recurrenceType() ) { case Recurrence::rDaily: - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "daily" ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceDailyFreq ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "daily" ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceDailyFreq ), TQString::number( r->frequency() ) ); break; case Recurrence::rWeekly: { - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "weekly" ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceWeeklyFreq ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "weekly" ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceWeeklyFreq ), TQString::number( r->frequency() ) ); // TODO: SLOX support int oxDays = 0; @@ -536,61 +536,61 @@ void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc, oxDays += 1 << ( ( i + 1 ) % 7 ); } if ( type() == "ox" ) - WebdavHandler::addSloxElement( this, doc, tqparent, "days", TQString::number( oxDays ) ); + WebdavHandler::addSloxElement( this, doc, parent, "days", TQString::number( oxDays ) ); break; } case Recurrence::rMonthlyDay: - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "monthly" ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthlyFreq ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "monthly" ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthlyFreq ), TQString::number( r->frequency() ) ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthlyDay ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthlyDay ), TQString::number( r->monthDays().first() ) ); break; case Recurrence::rMonthlyPos: { - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), type() == "ox" ? "monthly" : "monthly2" ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Freq ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Freq ), TQString::number( r->frequency() ) ); RecurrenceRule::WDayPos wdp = r->monthPositions().first(); // TODO: SLOX support - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Day ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Day ), TQString::number( 1 << wdp.day() ) ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Pos ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Pos ), TQString::number( wdp.pos() ) ); break; } case Recurrence::rYearlyMonth: - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "yearly" ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearlyDay ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "yearly" ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearlyDay ), TQString::number( r->yearDates().first() ) ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearlyMonth ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearlyMonth ), TQString::number( r->yearMonths().first() + monthOffset ) ); if ( type() == "ox" ) - WebdavHandler::addSloxElement( this, doc, tqparent, "interval", "1" ); + WebdavHandler::addSloxElement( this, doc, parent, "interval", "1" ); break; case Recurrence::rYearlyPos: { - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), type() == "ox" ? "yearly" : "yearly2" ); RecurrenceRule::WDayPos wdp = r->monthPositions().first(); // TODO: SLOX support - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Day ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Day ), TQString::number( 1 << wdp.day() ) ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Pos ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Pos ), TQString::number( wdp.pos() ) ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Month ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Month ), TQString::number( r->yearMonths().first() + monthOffset ) ); if ( type() == "ox" ) - WebdavHandler::addSloxElement( this, doc, tqparent, "interval", "1" ); + WebdavHandler::addSloxElement( this, doc, parent, "interval", "1" ); break; } default: kdDebug() << k_funcinfo << "unsupported recurrence type: " << r->recurrenceType() << endl; } - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceEnd ), + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceEnd ), WebdavHandler::qDateTimeToSlox( r->endDateTime() ) ); // delete exceptions DateList exlist = r->exDates(); TQStringList res; for ( DateList::Iterator it = exlist.begin(); it != exlist.end(); ++it ) res.append( WebdavHandler::qDateTimeToSlox( *it ) ); - WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceDelEx ), res.join( "," ) ); + WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceDelEx ), res.join( "," ) ); } void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e, diff --git a/kresources/slox/kcalresourceslox.h b/kresources/slox/kcalresourceslox.h index 73e44a118..17eb8789a 100644 --- a/kresources/slox/kcalresourceslox.h +++ b/kresources/slox/kcalresourceslox.h @@ -125,16 +125,16 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase void parseRecurrence( const TQDomNode &n, KCal::Event *event ); void createIncidenceAttributes( TQDomDocument &doc, - TQDomElement &tqparent, + TQDomElement &parent, KCal::Incidence *incidence ); void createEventAttributes( TQDomDocument &doc, - TQDomElement &tqparent, + TQDomElement &parent, KCal::Event *event ); void createTodoAttributes( TQDomDocument &doc, - TQDomElement &tqparent, + TQDomElement &parent, KCal::Todo *todo ); void createRecurrenceAttributes( TQDomDocument &doc, - TQDomElement &tqparent, + TQDomElement &parent, KCal::Incidence *incidence ); bool confirmSave(); diff --git a/kresources/slox/kcalresourcesloxconfig.cpp b/kresources/slox/kcalresourcesloxconfig.cpp index 8b1683ea5..441ea5336 100644 --- a/kresources/slox/kcalresourcesloxconfig.cpp +++ b/kresources/slox/kcalresourcesloxconfig.cpp @@ -40,8 +40,8 @@ #include "kcalresourcesloxconfig.h" -KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* tqparent, const char* name ) : - KRES::ConfigWidget( tqparent, name ), mRes( 0 ) +KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent, const char* name ) : + KRES::ConfigWidget( parent, name ), mRes( 0 ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 6, 2, KDialog::spacingHint(), KDialog::spacingHint() ); diff --git a/kresources/slox/kcalresourcesloxconfig.h b/kresources/slox/kcalresourcesloxconfig.h index 56fef761e..63526070c 100644 --- a/kresources/slox/kcalresourcesloxconfig.h +++ b/kresources/slox/kcalresourcesloxconfig.h @@ -47,7 +47,7 @@ class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - KCalResourceSloxConfig( TQWidget *tqparent = 0, const char *name = 0 ); + KCalResourceSloxConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp index f2fe58a92..4f17ea893 100644 --- a/kresources/slox/sloxfolderdialog.cpp +++ b/kresources/slox/sloxfolderdialog.cpp @@ -25,8 +25,8 @@ #include "sloxfolderdialog.h" #include "sloxfoldermanager.h" -SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget *tqparent, const char *name ) : - KDialogBase( tqparent, name, true, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, KGuiItem( i18n("Reload"), "reload" ) ), +SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget *parent, const char *name ) : + KDialogBase( parent, name, true, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, KGuiItem( i18n("Reload"), "reload" ) ), mManager( manager ), mFolderType( type ) { @@ -71,10 +71,10 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder ) if ( folder->type() != mFolderType && folder->type() != Unbound ) return; if( mManager->folders().contains( folder->parentId() ) ) { - SloxFolder *tqparent = mManager->folders()[folder->parentId()]; - createFolderViewItem( tqparent ); - if ( tqparent->item ) - folder->item = new KListViewItem( tqparent->item ); + SloxFolder *parent = mManager->folders()[folder->parentId()]; + createFolderViewItem( parent ); + if ( parent->item ) + folder->item = new KListViewItem( parent->item ); else folder->item = new KListViewItem( mListView ); } else { diff --git a/kresources/slox/sloxfolderdialog.h b/kresources/slox/sloxfolderdialog.h index 3c2cac883..c29ebda59 100644 --- a/kresources/slox/sloxfolderdialog.h +++ b/kresources/slox/sloxfolderdialog.h @@ -33,7 +33,7 @@ class SloxFolderDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* tqparent = 0, const char *name = 0 ); + SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = 0, const char *name = 0 ); ~SloxFolderDialog(); TQString selectedFolder() const; diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp index 6c07a9af9..47d62d376 100644 --- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp +++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp @@ -40,8 +40,8 @@ using namespace KCal; -ResourceTVAnytimeConfig::ResourceTVAnytimeConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceTVAnytimeConfig::ResourceTVAnytimeConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 ); diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h index b4a391e2e..e88ce6f0b 100644 --- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h +++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h @@ -43,7 +43,7 @@ class KDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - ResourceTVAnytimeConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceTVAnytimeConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp index fcc1a8a0a..dc8e47607 100644 --- a/ktnef/gui/attachpropertydialog.cpp +++ b/ktnef/gui/attachpropertydialog.cpp @@ -33,8 +33,8 @@ #include <tqdatastream.h> #include <tqpicture.h> -AttachPropertyDialog::AttachPropertyDialog(TQWidget *tqparent, const char *name) - : AttachPropertyDialogBase(tqparent, name, true) +AttachPropertyDialog::AttachPropertyDialog(TQWidget *parent, const char *name) + : AttachPropertyDialogBase(parent, name, true) { } @@ -113,19 +113,19 @@ void formatPropertySet( KTNEFPropertySet *pSet, TQListView *lv ) formatProperties( pSet->attributes(), 0, item, "attr" ); } -void saveProperty( TQListView *lv, KTNEFPropertySet *pSet, TQWidget *tqparent ) +void saveProperty( TQListView *lv, KTNEFPropertySet *pSet, TQWidget *parent ) { TQListViewItem *item = lv->selectedItem(); if ( !item ) - KMessageBox::error( tqparent, i18n( "Select an item." ) ); + KMessageBox::error( parent, i18n( "Select an item." ) ); else if ( item->text( 2 ).isEmpty() ) - KMessageBox::error( tqparent, i18n( "The selected item cannot be saved." ) ); + KMessageBox::error( parent, i18n( "The selected item cannot be saved." ) ); else { TQString tag = item->text( 2 ); int key = tag.mid( 5 ).toInt(); TQVariant prop = ( tag.startsWith( "attr_" ) ? pSet->attribute( key ) : pSet->property( key ) ); - TQString filename = KFileDialog::getSaveFileName( tag, TQString(), tqparent ); + TQString filename = KFileDialog::getSaveFileName( tag, TQString(), parent ); if ( !filename.isEmpty() ) { TQFile f( filename ); @@ -146,7 +146,7 @@ void saveProperty( TQListView *lv, KTNEFPropertySet *pSet, TQWidget *tqparent ) f.close(); } else - KMessageBox::error( tqparent, i18n( "Unable to open file for writing, check file permissions." ) ); + KMessageBox::error( parent, i18n( "Unable to open file for writing, check file permissions." ) ); } } } diff --git a/ktnef/gui/attachpropertydialog.h b/ktnef/gui/attachpropertydialog.h index b390caffe..aa5e2bf3a 100644 --- a/ktnef/gui/attachpropertydialog.h +++ b/ktnef/gui/attachpropertydialog.h @@ -31,7 +31,7 @@ class TQListViewItem; class AttachPropertyDialog : public AttachPropertyDialogBase { public: - AttachPropertyDialog(TQWidget *tqparent = 0, const char *name = 0); + AttachPropertyDialog(TQWidget *parent = 0, const char *name = 0); ~AttachPropertyDialog(); void setAttachment(KTNEFAttach *attach); diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index d6781770e..41e2d590f 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -57,8 +57,8 @@ #define NOT_IMPLEMENTED TQMessageBox::information(this, "ktnef", "Not implemented yet", TQMessageBox::Ok|TQMessageBox::Default, 0) -KTNEFMain::KTNEFMain(TQWidget *tqparent, const char *name) - : KMainWindow(tqparent, name) +KTNEFMain::KTNEFMain(TQWidget *parent, const char *name) + : KMainWindow(parent, name) { setupActions(); setupStatusbar(); diff --git a/ktnef/gui/ktnefmain.h b/ktnef/gui/ktnefmain.h index 1b645d1e5..ba7993d44 100644 --- a/ktnef/gui/ktnefmain.h +++ b/ktnef/gui/ktnefmain.h @@ -32,7 +32,7 @@ class KTNEFMain : public KMainWindow TQ_OBJECT public: - KTNEFMain(TQWidget *tqparent = 0, const char *name = 0); + KTNEFMain(TQWidget *parent = 0, const char *name = 0); ~KTNEFMain(); void loadFile(const TQString& filename); diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp index dcf401ab3..871de9e04 100644 --- a/ktnef/gui/ktnefview.cpp +++ b/ktnef/gui/ktnefview.cpp @@ -33,7 +33,7 @@ class Attachment : public TQListViewItem { public: - Attachment(TQListView *tqparent, KTNEFAttach *attach); + Attachment(TQListView *parent, KTNEFAttach *attach); ~Attachment(); KTNEFAttach* getAttachment() const { return attach_; } @@ -42,14 +42,14 @@ private: KTNEFAttach *attach_; }; -Attachment::Attachment(TQListView *tqparent, KTNEFAttach *attach) - : TQListViewItem(tqparent, attach->name()), attach_(attach) +Attachment::Attachment(TQListView *parent, KTNEFAttach *attach) + : TQListViewItem(parent, attach->name()), attach_(attach) { setText(2, TQString::number( attach_->size() )); if (!attach_->fileName().isEmpty()) setText(0, attach_->fileName()); KMimeType::Ptr mimeType = KMimeType::mimeType( attach_->mimeTag() ); setText(1, mimeType->comment()); - TQPixmap pix = loadRenderingPixmap( attach, tqparent->tqcolorGroup().base() ); + TQPixmap pix = loadRenderingPixmap( attach, parent->tqcolorGroup().base() ); if ( !pix.isNull() ) setPixmap( 0, pix ); else @@ -63,8 +63,8 @@ Attachment::~Attachment() //------------------------------------------------------------------------------------------------------ -KTNEFView::KTNEFView(TQWidget *tqparent, const char *name) - : KListView(tqparent,name) +KTNEFView::KTNEFView(TQWidget *parent, const char *name) + : KListView(parent,name) { attachments_.setAutoDelete(false); addColumn(i18n("File Name")); diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h index 8fbe5e4bf..25504f87a 100644 --- a/ktnef/gui/ktnefview.h +++ b/ktnef/gui/ktnefview.h @@ -30,7 +30,7 @@ class KDE_EXPORT KTNEFView : public KListView TQ_OBJECT public: - KTNEFView(TQWidget *tqparent = 0, const char *name = 0); + KTNEFView(TQWidget *parent = 0, const char *name = 0); ~KTNEFView(); void setAttachments(TQPtrList<KTNEFAttach> *list); diff --git a/ktnef/gui/messagepropertydialog.cpp b/ktnef/gui/messagepropertydialog.cpp index 075b4823b..a2b1f75f9 100644 --- a/ktnef/gui/messagepropertydialog.cpp +++ b/ktnef/gui/messagepropertydialog.cpp @@ -22,8 +22,8 @@ #include <klistview.h> #include <klocale.h> -MessagePropertyDialog::MessagePropertyDialog( TQWidget *tqparent, KTNEFMessage *msg ) - : KDialogBase( tqparent, "MessagePropertyDialog", true, i18n( "Message Properties" ), +MessagePropertyDialog::MessagePropertyDialog( TQWidget *parent, KTNEFMessage *msg ) + : KDialogBase( parent, "MessagePropertyDialog", true, i18n( "Message Properties" ), KDialogBase::Close|KDialogBase::User1, KDialogBase::Close, false, KStdGuiItem::save() ) { diff --git a/ktnef/gui/messagepropertydialog.h b/ktnef/gui/messagepropertydialog.h index d7db44def..b7060d880 100644 --- a/ktnef/gui/messagepropertydialog.h +++ b/ktnef/gui/messagepropertydialog.h @@ -28,7 +28,7 @@ class MessagePropertyDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - MessagePropertyDialog( TQWidget *tqparent, KTNEFMessage *msg ); + MessagePropertyDialog( TQWidget *parent, KTNEFMessage *msg ); protected slots: void slotUser1(); diff --git a/ktnef/tests/mapi_attach_data_obj.tnef b/ktnef/tests/mapi_attach_data_obj.tnef Binary files differindex 2c5b64731..66f7890c3 100644 --- a/ktnef/tests/mapi_attach_data_obj.tnef +++ b/ktnef/tests/mapi_attach_data_obj.tnef diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp index a860072da..eed17afe8 100644 --- a/libkcal/alarm.cpp +++ b/libkcal/alarm.cpp @@ -29,8 +29,8 @@ using namespace KCal; -Alarm::Alarm(Incidence *tqparent) - : mParent(tqparent), +Alarm::Alarm(Incidence *parent) + : mParent(parent), mType(Invalid), mDescription(""), // to make operator==() not fail mFile(""), // to make operator==() not fail @@ -476,9 +476,9 @@ Duration Alarm::endOffset() const return (mHasTime || !mEndOffset) ? Duration( 0 ) : mOffset; } -void Alarm::setParent( Incidence *tqparent ) +void Alarm::setParent( Incidence *parent ) { - mParent = tqparent; + mParent = parent; } void Alarm::customPropertyUpdated() diff --git a/libkcal/alarm.h b/libkcal/alarm.h index fc85e96f7..efe047d62 100644 --- a/libkcal/alarm.h +++ b/libkcal/alarm.h @@ -52,7 +52,7 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties /** Construct a new alarm with variables initialized to "sane" values. */ - explicit Alarm( Incidence *tqparent ); + explicit Alarm( Incidence *parent ); /** Destruct Alarm object. */ @@ -342,13 +342,13 @@ class LIBKCAL_EXPORT Alarm : public CustomProperties bool enabled() const; /** - Set the alarm's tqparent incidence. + Set the alarm's parent incidence. */ void setParent( Incidence * ); /** - Get the alarm's tqparent incidence. + Get the alarm's parent incidence. */ - Incidence *tqparent() const { return mParent; } + Incidence *parent() const { return mParent; } protected: /** diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index a465a7748..009c57785 100644 --- a/libkcal/attachmenthandler.cpp +++ b/libkcal/attachmenthandler.cpp @@ -47,7 +47,7 @@ namespace KCal { -Attachment *AttachmentHandler::find( TQWidget *tqparent, const TQString &attachmentName, +Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmentName, Incidence *incidence ) { if ( !incidence ) { @@ -69,15 +69,15 @@ Attachment *AttachmentHandler::find( TQWidget *tqparent, const TQString &attachm if ( !a ) { KMessageBox::error( - tqparent, + parent, i18n( "No attachment named \"%1\" found in the incidence." ).tqarg( attachmentName ) ); return 0; } if ( a->isUri() ) { - if ( !KIO::NetAccess::exists( a->uri(), true, tqparent ) ) { + if ( !KIO::NetAccess::exists( a->uri(), true, parent ) ) { KMessageBox::sorry( - tqparent, + parent, i18n( "The attachment \"%1\" is a web link that is inaccessible from this computer. " ). arg( KURL::decode_string( a->uri() ) ) ); return 0; @@ -86,7 +86,7 @@ Attachment *AttachmentHandler::find( TQWidget *tqparent, const TQString &attachm return a; } -Attachment *AttachmentHandler::find( TQWidget *tqparent, +Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmentName, const TQString &uid ) { if ( uid.isEmpty() ) { @@ -99,16 +99,16 @@ Attachment *AttachmentHandler::find( TQWidget *tqparent, Incidence *incidence = cal->incidence( uid ); if ( !incidence ) { KMessageBox::error( - tqparent, + parent, i18n( "The incidence that owns the attachment named \"%1\" could not be found. " "Perhaps it was removed from your calendar?" ).tqarg( attachmentName ) ); return 0; } - return find( tqparent, attachmentName, incidence ); + return find( parent, attachmentName, incidence ); } -Attachment *AttachmentHandler::find( TQWidget *tqparent, const TQString &attachmentName, +Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message ) { if ( !message ) { @@ -118,13 +118,13 @@ Attachment *AttachmentHandler::find( TQWidget *tqparent, const TQString &attachm Incidence *incidence = dynamic_cast<Incidence*>( message->event() ); if ( !incidence ) { KMessageBox::error( - tqparent, + parent, i18n( "The calendar invitation stored in this email message is broken in some way. " "Unable to continue." ) ); return 0; } - return find( tqparent, attachmentName, incidence ); + return find( parent, attachmentName, incidence ); } static KTempFile *s_tempFile = 0; @@ -157,7 +157,7 @@ static KURL tempFileForAttachment( Attachment *attachment ) return url; } -bool AttachmentHandler::view( TQWidget *tqparent, Attachment *attachment ) +bool AttachmentHandler::view( TQWidget *parent, Attachment *attachment ) { if ( !attachment ) { return false; @@ -174,7 +174,7 @@ bool AttachmentHandler::view( TQWidget *tqparent, Attachment *attachment ) } else { stat = false; KMessageBox::error( - tqparent, + parent, i18n( "Unable to create a temporary file for the attachment." ) ); } delete s_tempFile; @@ -183,31 +183,31 @@ bool AttachmentHandler::view( TQWidget *tqparent, Attachment *attachment ) return stat; } -bool AttachmentHandler::view( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence ) +bool AttachmentHandler::view( TQWidget *parent, const TQString &attachmentName, Incidence *incidence ) { - return view( tqparent, find( tqparent, attachmentName, incidence ) ); + return view( parent, find( parent, attachmentName, incidence ) ); } -bool AttachmentHandler::view( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ) +bool AttachmentHandler::view( TQWidget *parent, const TQString &attachmentName, const TQString &uid ) { - return view( tqparent, find( tqparent, attachmentName, uid ) ); + return view( parent, find( parent, attachmentName, uid ) ); } -bool AttachmentHandler::view( TQWidget *tqparent, const TQString &attachmentName, +bool AttachmentHandler::view( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message ) { - return view( tqparent, find( tqparent, attachmentName, message ) ); + return view( parent, find( parent, attachmentName, message ) ); } -bool AttachmentHandler::saveAs( TQWidget *tqparent, Attachment *attachment ) +bool AttachmentHandler::saveAs( TQWidget *parent, Attachment *attachment ) { // get the saveas file name - TQString saveAsFile = KFileDialog::getSaveFileName( attachment->label(), TQString(), tqparent, + TQString saveAsFile = KFileDialog::getSaveFileName( attachment->label(), TQString(), parent, i18n( "Save Attachment" ) ); if ( saveAsFile.isEmpty() || ( TQFile( saveAsFile ).exists() && ( KMessageBox::warningYesNo( - tqparent, + parent, i18n( "%1 already exists. Do you want to overwrite it?"). arg( saveAsFile ) ) == KMessageBox::No ) ) ) { return false; @@ -223,12 +223,12 @@ bool AttachmentHandler::saveAs( TQWidget *tqparent, Attachment *attachment ) if ( tempUrl.isValid() ) { stat = KIO::NetAccess::file_copy( tempUrl, KURL( saveAsFile ), -1, true ); if ( !stat && KIO::NetAccess::lastError() ) { - KMessageBox::error( tqparent, KIO::NetAccess::lastErrorString() ); + KMessageBox::error( parent, KIO::NetAccess::lastErrorString() ); } } else { stat = false; KMessageBox::error( - tqparent, + parent, i18n( "Unable to create a temporary file for the attachment." ) ); } delete s_tempFile; @@ -237,21 +237,21 @@ bool AttachmentHandler::saveAs( TQWidget *tqparent, Attachment *attachment ) return stat; } -bool AttachmentHandler::saveAs( TQWidget *tqparent, const TQString &attachmentName, +bool AttachmentHandler::saveAs( TQWidget *parent, const TQString &attachmentName, Incidence *incidence ) { - return saveAs( tqparent, find( tqparent, attachmentName, incidence ) ); + return saveAs( parent, find( parent, attachmentName, incidence ) ); } -bool AttachmentHandler::saveAs( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ) +bool AttachmentHandler::saveAs( TQWidget *parent, const TQString &attachmentName, const TQString &uid ) { - return saveAs( tqparent, find( tqparent, attachmentName, uid ) ); + return saveAs( parent, find( parent, attachmentName, uid ) ); } -bool AttachmentHandler::saveAs( TQWidget *tqparent, const TQString &attachmentName, +bool AttachmentHandler::saveAs( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message ) { - return saveAs( tqparent, find( tqparent, attachmentName, message ) ); + return saveAs( parent, find( parent, attachmentName, message ) ); } } diff --git a/libkcal/attachmenthandler.h b/libkcal/attachmenthandler.h index 5bbeef46c..6116f15ad 100644 --- a/libkcal/attachmenthandler.h +++ b/libkcal/attachmenthandler.h @@ -49,128 +49,128 @@ namespace AttachmentHandler { /** Finds the attachment in the user's calendar, by @p attachmentName and @p incidence. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param incidence is a pointer to a valid Incidence object containing the attachment. @return a pointer to the Attachment object located; 0 if no such attachment could be found. */ - Attachment *find( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence ); + Attachment *find( TQWidget *parent, const TQString &attachmentName, Incidence *incidence ); /** Finds the attachment in the user's calendar, by @p attachmentName and a scheduler message; in other words, this function is intended to retrieve attachments from calendar invitations. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param message is a pointer to a valid ScheduleMessage object containing the attachment. @return a pointer to the Attachment object located; 0 if no such attachment could be found. */ - Attachment *find( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message ); + Attachment *find( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message ); /** Finds the attachment in the user's calendar, by @p attachmentName and @p uid. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param uid is a TQString containing a UID of the incidence containing the attachment. @return a pointer to the Attachment object located; 0 if no such attachment could be found. */ - Attachment *find( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ); + Attachment *find( TQWidget *parent, const TQString &attachmentName, const TQString &uid ); /** Launches a viewer on the specified attachment. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachment is a pointer to a valid Attachment object. @return true if the viewer program successfully launched; false otherwise. */ - bool view( TQWidget *tqparent, Attachment *attachment ); + bool view( TQWidget *parent, Attachment *attachment ); /** Launches a viewer on the specified attachment. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param incidence is a pointer to a valid Incidence object containing the attachment. @return true if the attachment could be found and the viewer program successfully launched; false otherwise. */ - bool view( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence ); + bool view( TQWidget *parent, const TQString &attachmentName, Incidence *incidence ); /** Launches a viewer on the specified attachment. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param uid is a TQString containing a UID of the incidence containing the attachment. @return true if the attachment could be found and the viewer program successfully launched; false otherwise. */ - bool view( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ); + bool view( TQWidget *parent, const TQString &attachmentName, const TQString &uid ); /** Launches a viewer on the specified attachment. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param message is a pointer to a valid ScheduleMessage object containing the attachment. @return true if the attachment could be found and the viewer program successfully launched; false otherwise. */ - bool view( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message ); + bool view( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message ); /** Saves the specified attachment to a file of the user's choice. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachment is a pointer to a valid Attachment object. @return true if the save operation was successful; false otherwise. */ - bool saveAs( TQWidget *tqparent, Attachment *attachment ); + bool saveAs( TQWidget *parent, Attachment *attachment ); /** Saves the specified attachment to a file of the user's choice. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param incidence is a pointer to a valid Incidence object containing the attachment. @return true if the attachment could be found and the save operation was successful; false otherwise. */ - bool saveAs( TQWidget *tqparent, const TQString &attachmentName, Incidence *incidence ); + bool saveAs( TQWidget *parent, const TQString &attachmentName, Incidence *incidence ); /** Saves the specified attachment to a file of the user's choice. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param uid is a TQString containing a UID of the incidence containing the attachment. @return true if the attachment could be found and the save operation was successful; false otherwise. */ - bool saveAs( TQWidget *tqparent, const TQString &attachmentName, const TQString &uid ); + bool saveAs( TQWidget *parent, const TQString &attachmentName, const TQString &uid ); /** Saves the specified attachment to a file of the user's choice. - @param tqparent is the tqparent widget for the dialogs used in this function. + @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param message is a pointer to a valid ScheduleMessage object containing the attachment. @return true if the attachment could be found and the save operation was successful; false otherwise. */ - bool saveAs( TQWidget *tqparent, const TQString &attachmentName, ScheduleMessage *message ); + bool saveAs( TQWidget *parent, const TQString &attachmentName, ScheduleMessage *message ); } } diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index 4ff7137e6..897e90175 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -474,7 +474,7 @@ bool Calendar::deleteIncidence( Incidence *incidence ) { if ( beginChange( incidence ) ) { if (incidence->hasRecurrenceID()) { - // Delete this event's UID from the tqparent's list of tqchildren + // Delete this event's UID from the parent's list of tqchildren Incidence *parentIncidence; IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; @@ -841,7 +841,7 @@ void Calendar::setupRelations( Incidence *forincidence ) // kdDebug(5850) << "Calendar::setupRelations for incidence " << forincidence << " with UID " << forincidence->uid() << ", summary: " << forincidence->summary() << endl; TQString uid = forincidence->uid(); - // First, go over the list of orphans and see if this is their tqparent + // First, go over the list of orphans and see if this is their parent while ( Incidence* i = mOrphans[ uid ] ) { mOrphans.remove( uid ); i->setRelatedTo( forincidence ); @@ -849,19 +849,19 @@ void Calendar::setupRelations( Incidence *forincidence ) mOrphanUids.remove( i->uid() ); } - // Now see about this incidences tqparent + // Now see about this incidences parent if ( !forincidence->relatedTo() && !forincidence->relatedToUid().isEmpty() ) { // This incidence has a uid it is related to but is not registered to it yet // Try to find it - Incidence* tqparent = incidence( forincidence->relatedToUid() ); - if ( tqparent ) { + Incidence* parent = incidence( forincidence->relatedToUid() ); + if ( parent ) { // Found it - forincidence->setRelatedTo( tqparent ); - tqparent->addRelation( forincidence ); + forincidence->setRelatedTo( parent ); + parent->addRelation( forincidence ); } else { // Not found, put this in the mOrphans list // Note that the mOrphans dict might have several entries with the same key! That are - // multiple tqchildren that wait for the tqparent incidence to be inserted. + // multiple tqchildren that wait for the parent incidence to be inserted. mOrphans.insert( forincidence->relatedToUid(), forincidence ); mOrphanUids.insert( forincidence->uid(), forincidence ); } @@ -901,10 +901,10 @@ void Calendar::removeRelations( Incidence *incidence ) // Since the mOrphans dict might contain the same key (with different // child incidence pointers!) multiple times, take care that we remove // the correct one. So we need to remove all items with the given - // tqparent UID, and readd those that are not for this item. Also, there + // parent UID, and readd those that are not for this item. Also, there // might be other entries with differnet UID that point to this // incidence (this might happen when the relatedTo of the item is - // changed before its tqparent is inserted. This might happen with + // changed before its parent is inserted. This might happen with // groupware servers....). Remove them, too TQStringList relatedToUids; // First get the list of all keys in the mOrphans list that point to the removed item diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index df3c19855..abd1cc213 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -108,7 +108,7 @@ ResourceCalendar } KRES::Resource *r; - r = KRES::SelectDialog::getResource( list, tqparent() ); + r = KRES::SelectDialog::getResource( list, parent() ); return static_cast<ResourceCalendar *>( r ); } @@ -215,12 +215,12 @@ void CalendarResources::setAskDestinationPolicy() TQWidget *CalendarResources::dialogParentWidget() { - return mDestinationPolicy->tqparent(); + return mDestinationPolicy->parent(); } -void CalendarResources::setDialogParentWidget( TQWidget *tqparent ) +void CalendarResources::setDialogParentWidget( TQWidget *parent ) { - mDestinationPolicy->setParent( tqparent ); + mDestinationPolicy->setParent( parent ); } void CalendarResources::close() diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h index 3f6015020..1b884b6a2 100644 --- a/libkcal/calendarresources.h +++ b/libkcal/calendarresources.h @@ -75,12 +75,12 @@ class LIBKCAL_EXPORT CalendarResources : { public: DestinationPolicy( CalendarResourceManager *manager, - TQWidget *tqparent = 0 ) : - mManager( manager ), mParent( tqparent ) {} + TQWidget *parent = 0 ) : + mManager( manager ), mParent( parent ) {} virtual ResourceCalendar *destination( Incidence *incidence ) = 0; - virtual TQWidget *tqparent() { return mParent; } - virtual void setParent( TQWidget *newtqparent ) { mParent = newtqparent; } + virtual TQWidget *parent() { return mParent; } + virtual void setParent( TQWidget *newparent ) { mParent = newparent; } bool hasCalendarResources(); protected: CalendarResourceManager *resourceManager() @@ -98,8 +98,8 @@ class LIBKCAL_EXPORT CalendarResources : { public: StandardDestinationPolicy( CalendarResourceManager *manager, - TQWidget *tqparent = 0 ) : - DestinationPolicy( manager, tqparent ) {} + TQWidget *parent = 0 ) : + DestinationPolicy( manager, parent ) {} ResourceCalendar *destination( Incidence *incidence ); @@ -115,8 +115,8 @@ class LIBKCAL_EXPORT CalendarResources : { public: AskDestinationPolicy( CalendarResourceManager *manager, - TQWidget *tqparent = 0 ) : - DestinationPolicy( manager, tqparent ) {} + TQWidget *parent = 0 ) : + DestinationPolicy( manager, parent ) {} ResourceCalendar *destination( Incidence *incidence ); @@ -271,8 +271,8 @@ class LIBKCAL_EXPORT CalendarResources : void setAskDestinationPolicy(); /** - Returns the current tqparent for new dialogs. This is a bad hack, but we need - to properly set the tqparent for the resource selection dialog. Otherwise + Returns the current parent for new dialogs. This is a bad hack, but we need + to properly set the parent for the resource selection dialog. Otherwise the dialog will not be modal to the editor dialog in korganizer and the user can still work in the editor dialog (and thus crash korganizer). Afterwards we need to reset it (to avoid pointers to widgets that are @@ -280,12 +280,12 @@ class LIBKCAL_EXPORT CalendarResources : */ TQWidget *dialogParentWidget(); /** - Set the widget tqparent for new dialogs. This is a bad hack, but we need - to properly set the tqparent for the resource selection dialog. Otherwise + Set the widget parent for new dialogs. This is a bad hack, but we need + to properly set the parent for the resource selection dialog. Otherwise the dialog will not be modal to the editor dialog in korganizer and the user can still work in the editor dialog (and thus crash korganizer). */ - void setDialogParentWidget( TQWidget *tqparent ); + void setDialogParentWidget( TQWidget *parent ); /** Request ticket for saving the Calendar. If a ticket is returned the diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp index b1e32f32e..298341488 100644 --- a/libkcal/confirmsavedialog.cpp +++ b/libkcal/confirmsavedialog.cpp @@ -30,8 +30,8 @@ using namespace KCal; ConfirmSaveDialog::ConfirmSaveDialog( const TQString &destination, - TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("Confirm Save"), Ok | Cancel ) + TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("Confirm Save"), Ok | Cancel ) { TQFrame *topFrame = makeMainWidget(); diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h index cb6a09056..c20a4951b 100644 --- a/libkcal/confirmsavedialog.h +++ b/libkcal/confirmsavedialog.h @@ -32,7 +32,7 @@ namespace KCal { class KDE_EXPORT ConfirmSaveDialog : public KDialogBase { public: - ConfirmSaveDialog( const TQString &destination, TQWidget *tqparent, + ConfirmSaveDialog( const TQString &destination, TQWidget *parent, const char *name = 0 ); void addIncidences( const Incidence::List &incidences, diff --git a/libkcal/icaldrag.cpp b/libkcal/icaldrag.cpp index 4ff3111a2..2c5f2309d 100644 --- a/libkcal/icaldrag.cpp +++ b/libkcal/icaldrag.cpp @@ -28,8 +28,8 @@ using namespace KCal; -ICalDrag::ICalDrag( Calendar *cal, TQWidget *tqparent, const char *name ) - : TQStoredDrag( "text/calendar", tqparent, name ) +ICalDrag::ICalDrag( Calendar *cal, TQWidget *parent, const char *name ) + : TQStoredDrag( "text/calendar", parent, name ) { ICalFormat icf; TQString scal = icf.toString( cal ); diff --git a/libkcal/icaldrag.h b/libkcal/icaldrag.h index b1beb4363..ac91742dc 100644 --- a/libkcal/icaldrag.h +++ b/libkcal/icaldrag.h @@ -38,7 +38,7 @@ class LIBKCAL_EXPORT ICalDrag : public TQStoredDrag /** Create a drag&drop object for iCalendar component \a ical. */ - ICalDrag( Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 ); + ICalDrag( Calendar *cal, TQWidget *parent = 0, const char *name = 0 ); ~ICalDrag() {}; /** diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index c427b0df2..25feb42fa 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -298,9 +298,9 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar ) icalcomponent *component; TQString text = ""; - // See if there are any tqparent or child events that must be added to the string + // See if there are any parent or child events that must be added to the string if ( incidence->hasRecurrenceID() ) { - // Get the tqparent + // Get the parent IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; it = il.begin(); @@ -319,7 +319,7 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar ) icalcomponent_free( component ); } else { - // This incidence is a potential tqparent + // This incidence is a potential parent IncidenceList il = incidence->childIncidences(); if (il.count() > 0) { IncidenceListIterator it; diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index 50879378e..bb53a3531 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -83,8 +83,8 @@ const int gSecondsPerHour = gSecondsPerMinute * 60; const int gSecondsPerDay = gSecondsPerHour * 24; const int gSecondsPerWeek = gSecondsPerDay * 7; -ICalFormatImpl::ICalFormatImpl( ICalFormat *tqparent ) : - mParent( tqparent ), mCompat( new Compat ) +ICalFormatImpl::ICalFormatImpl( ICalFormat *parent ) : + mParent( parent ), mCompat( new Compat ) { } @@ -305,7 +305,7 @@ icalcomponent *ICalFormatImpl::writeJournal(Journal *journal) return vjournal; } -void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence) +void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) { // pilot sync stuff // TODO: move this application-specific code to kpilot @@ -318,17 +318,17 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence icalproperty *p = 0; p = icalproperty_new_x(TQString::number(incidence->synctqStatus()).utf8()); icalproperty_set_x_name(p,"X-PILOTSTAT"); - icalcomponent_add_property(tqparent,p); + icalcomponent_add_property(parent,p); p = icalproperty_new_x(TQString::number(incidence->pilotId()).utf8()); icalproperty_set_x_name(p,"X-PILOTID"); - icalcomponent_add_property(tqparent,p); + icalcomponent_add_property(parent,p); } TQString modifiedUid; if ( incidence->hasRecurrenceID() ) { - // Recurring incidences are special; they must match their tqparent's UID - // Each child has the tqparent set as the first item in the list + // Recurring incidences are special; they must match their parent's UID + // Each child has the parent set as the first item in the list // So, get and set the UID... IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; @@ -346,53 +346,53 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence else incidence->removeCustomProperty( "LIBKCAL", "ID" ); - writeIncidenceBase(tqparent,incidence); + writeIncidenceBase(parent,incidence); // creation date - icalcomponent_add_property(tqparent,icalproperty_new_created( + icalcomponent_add_property(parent,icalproperty_new_created( writeICalDateTime(incidence->created()))); // unique id // If the scheduling ID is different from the real UID, the real // one is stored on X-REALID above if ( incidence->hasRecurrenceID() ) { - // Recurring incidences are special; they must match their tqparent's UID - icalcomponent_add_property(tqparent,icalproperty_new_uid(modifiedUid.utf8())); + // Recurring incidences are special; they must match their parent's UID + icalcomponent_add_property(parent,icalproperty_new_uid(modifiedUid.utf8())); } else { if ( !incidence->schedulingID().isEmpty() ) { - icalcomponent_add_property(tqparent,icalproperty_new_uid( + icalcomponent_add_property(parent,icalproperty_new_uid( incidence->schedulingID().utf8())); } } // revision if ( incidence->revision() > 0 ) { // 0 is default, so don't write that out - icalcomponent_add_property(tqparent,icalproperty_new_sequence( + icalcomponent_add_property(parent,icalproperty_new_sequence( incidence->revision())); } // last modification date if ( incidence->lastModified().isValid() ) { - icalcomponent_add_property(tqparent,icalproperty_new_lastmodified( + icalcomponent_add_property(parent,icalproperty_new_lastmodified( writeICalDateTime(incidence->lastModified()))); } // description if (!incidence->description().isEmpty()) { - icalcomponent_add_property(tqparent,icalproperty_new_description( + icalcomponent_add_property(parent,icalproperty_new_description( incidence->description().utf8())); } // summary if (!incidence->summary().isEmpty()) { - icalcomponent_add_property(tqparent,icalproperty_new_summary( + icalcomponent_add_property(parent,icalproperty_new_summary( incidence->summary().utf8())); } // location if (!incidence->location().isEmpty()) { - icalcomponent_add_property(tqparent,icalproperty_new_location( + icalcomponent_add_property(parent,icalproperty_new_location( incidence->location().utf8())); } @@ -410,7 +410,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence case Incidence::StatusX: { icalproperty* p = icalproperty_new_status(ICAL_STATUS_X); icalvalue_set_x(icalproperty_get_value(p), incidence->statusStr().utf8()); - icalcomponent_add_property(tqparent, p); + icalcomponent_add_property(parent, p); break; } case Incidence::StatusNone: @@ -418,7 +418,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence break; } if (status != ICAL_STATUS_NONE) - icalcomponent_add_property(tqparent, icalproperty_new_status(status)); + icalcomponent_add_property(parent, icalproperty_new_status(status)); // secrecy icalproperty_class secClass; @@ -435,12 +435,12 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence break; } if ( secClass != ICAL_CLASS_PUBLIC ) { - icalcomponent_add_property(tqparent,icalproperty_new_class(secClass)); + icalcomponent_add_property(parent,icalproperty_new_class(secClass)); } // priority if ( incidence->priority() > 0 ) { // 0 is undefined priority - icalcomponent_add_property(tqparent,icalproperty_new_priority( + icalcomponent_add_property(parent,icalproperty_new_priority( incidence->priority())); } @@ -448,18 +448,18 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence TQStringList categories = incidence->categories(); TQStringList::Iterator it; for(it = categories.begin(); it != categories.end(); ++it ) { - icalcomponent_add_property(tqparent,icalproperty_new_categories((*it).utf8())); + icalcomponent_add_property(parent,icalproperty_new_categories((*it).utf8())); } // related event if ( !incidence->relatedToUid().isEmpty() ) { - icalcomponent_add_property(tqparent,icalproperty_new_relatedto( + icalcomponent_add_property(parent,icalproperty_new_relatedto( incidence->relatedToUid().utf8())); } // recurrenceid if ( incidence->hasRecurrenceID() ) { - icalcomponent_add_property(tqparent, icalproperty_new_recurrenceid( writeICalDateTime( incidence->recurrenceID() ) )); + icalcomponent_add_property(parent, icalproperty_new_recurrenceid( writeICalDateTime( incidence->recurrenceID() ) )); } // kdDebug(5800) << "Write recurrence for '" << incidence->summary() << "' (" << incidence->uid() @@ -468,27 +468,27 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence RecurrenceRule::List rrules( incidence->recurrence()->rRules() ); RecurrenceRule::List::ConstIterator rit; for ( rit = rrules.begin(); rit != rrules.end(); ++rit ) { - icalcomponent_add_property( tqparent, icalproperty_new_rrule( + icalcomponent_add_property( parent, icalproperty_new_rrule( writeRecurrenceRule( (*rit) ) ) ); } RecurrenceRule::List exrules( incidence->recurrence()->exRules() ); RecurrenceRule::List::ConstIterator exit; for ( exit = exrules.begin(); exit != exrules.end(); ++exit ) { - icalcomponent_add_property( tqparent, icalproperty_new_rrule( + icalcomponent_add_property( parent, icalproperty_new_rrule( writeRecurrenceRule( (*exit) ) ) ); } DateList dateList = incidence->recurrence()->exDates(); DateList::ConstIterator exIt; for(exIt = dateList.begin(); exIt != dateList.end(); ++exIt) { - icalcomponent_add_property(tqparent,icalproperty_new_exdate( + icalcomponent_add_property(parent,icalproperty_new_exdate( writeICalDate(*exIt))); } DateTimeList dateTimeList = incidence->recurrence()->exDateTimes(); DateTimeList::ConstIterator extIt; for(extIt = dateTimeList.begin(); extIt != dateTimeList.end(); ++extIt) { - icalcomponent_add_property(tqparent,icalproperty_new_exdate( + icalcomponent_add_property(parent,icalproperty_new_exdate( writeICalDateTime(*extIt))); } @@ -496,13 +496,13 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence dateList = incidence->recurrence()->rDates(); DateList::ConstIterator rdIt; for( rdIt = dateList.begin(); rdIt != dateList.end(); ++rdIt) { - icalcomponent_add_property( tqparent, icalproperty_new_rdate( + icalcomponent_add_property( parent, icalproperty_new_rdate( writeICalDatePeriod(*rdIt) ) ); } dateTimeList = incidence->recurrence()->rDateTimes(); DateTimeList::ConstIterator rdtIt; for( rdtIt = dateTimeList.begin(); rdtIt != dateTimeList.end(); ++rdtIt) { - icalcomponent_add_property( tqparent, icalproperty_new_rdate( + icalcomponent_add_property( parent, icalproperty_new_rdate( writeICalDateTimePeriod(*rdtIt) ) ); } @@ -510,7 +510,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence Attachment::List attachments = incidence->attachments(); Attachment::List::ConstIterator atIt; for ( atIt = attachments.begin(); atIt != attachments.end(); ++atIt ) { - icalcomponent_add_property( tqparent, writeAttachment( *atIt ) ); + icalcomponent_add_property( parent, writeAttachment( *atIt ) ); } // alarms @@ -519,7 +519,7 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence alarmIt != incidence->alarms().end(); ++alarmIt ) { if ( (*alarmIt)->enabled() ) { // kdDebug(5800) << "Write alarm for " << incidence->summary() << endl; - icalcomponent_add_component( tqparent, writeAlarm( *alarmIt ) ); + icalcomponent_add_component( parent, writeAlarm( *alarmIt ) ); } } @@ -527,19 +527,19 @@ void ICalFormatImpl::writeIncidence(icalcomponent *tqparent,Incidence *incidence if (incidence->hasDuration()) { icaldurationtype duration; duration = writeICalDuration( incidence->duration() ); - icalcomponent_add_property(tqparent,icalproperty_new_duration(duration)); + icalcomponent_add_property(parent,icalproperty_new_duration(duration)); } } -void ICalFormatImpl::writeIncidenceBase( icalcomponent *tqparent, +void ICalFormatImpl::writeIncidenceBase( icalcomponent *parent, IncidenceBase * incidenceBase ) { - icalcomponent_add_property( tqparent, icalproperty_new_dtstamp( + icalcomponent_add_property( parent, icalproperty_new_dtstamp( writeICalDateTime( TQDateTime::tqcurrentDateTime() ) ) ); // organizer stuff if ( !incidenceBase->organizer().isEmpty() ) { - icalcomponent_add_property( tqparent, writeOrganizer( incidenceBase->organizer() ) ); + icalcomponent_add_property( parent, writeOrganizer( incidenceBase->organizer() ) ); } // attendees @@ -547,27 +547,27 @@ void ICalFormatImpl::writeIncidenceBase( icalcomponent *tqparent, Attendee::List::ConstIterator it; for( it = incidenceBase->attendees().begin(); it != incidenceBase->attendees().end(); ++it ) { - icalcomponent_add_property( tqparent, writeAttendee( *it ) ); + icalcomponent_add_property( parent, writeAttendee( *it ) ); } } // comments TQStringList comments = incidenceBase->comments(); for (TQStringList::Iterator it=comments.begin(); it!=comments.end(); ++it) { - icalcomponent_add_property(tqparent, icalproperty_new_comment((*it).utf8())); + icalcomponent_add_property(parent, icalproperty_new_comment((*it).utf8())); } // custom properties - writeCustomProperties( tqparent, incidenceBase ); + writeCustomProperties( parent, incidenceBase ); } -void ICalFormatImpl::writeCustomProperties(icalcomponent *tqparent,CustomProperties *properties) +void ICalFormatImpl::writeCustomProperties(icalcomponent *parent,CustomProperties *properties) { TQMap<TQCString, TQString> custom = properties->customProperties(); for (TQMap<TQCString, TQString>::Iterator c = custom.begin(); c != custom.end(); ++c) { icalproperty *p = icalproperty_new_x(c.data().utf8()); icalproperty_set_x_name(p,c.key()); - icalcomponent_add_property(tqparent,p); + icalcomponent_add_property(parent,p); } } @@ -970,7 +970,7 @@ Todo *ICalFormatImpl::readTodo(icalcomponent *vtodo) todo->setPercentComplete(icalproperty_get_percentcomplete(p)); break; - case ICAL_RELATEDTO_PROPERTY: // related todo (tqparent) + case ICAL_RELATEDTO_PROPERTY: // related todo (parent) todo->setRelatedToUid(TQString::fromUtf8(icalproperty_get_relatedto(p))); mTodosRelate.append(todo); break; @@ -1050,7 +1050,7 @@ Event *ICalFormatImpl::readEvent( icalcomponent *vevent, icalcomponent *vtimezon dtEndProcessed = true; break; - case ICAL_RELATEDTO_PROPERTY: // related event (tqparent) + case ICAL_RELATEDTO_PROPERTY: // related event (parent) event->setRelatedToUid( TQString::fromUtf8( icalproperty_get_relatedto( p ) ) ); mEventsRelate.append( event ); break; @@ -1356,11 +1356,11 @@ Attachment *ICalFormatImpl::readAttachment(icalproperty *attach) return attachment; } -void ICalFormatImpl::readIncidence(icalcomponent *tqparent, icaltimezone *tz, Incidence *incidence) +void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Incidence *incidence) { - readIncidenceBase(tqparent,incidence); + readIncidenceBase(parent,incidence); - icalproperty *p = icalcomponent_get_first_property(tqparent,ICAL_ANY_PROPERTY); + icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY); const char *text; int intvalue, inttext; @@ -1516,7 +1516,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *tqparent, icaltimezone *tz, In break; } - p = icalcomponent_get_next_property(tqparent,ICAL_ANY_PROPERTY); + p = icalcomponent_get_next_property(parent,ICAL_ANY_PROPERTY); } // Set the scheduling ID @@ -1538,9 +1538,9 @@ void ICalFormatImpl::readIncidence(icalcomponent *tqparent, icaltimezone *tz, In incidence->setCategories(categories); // iterate through all alarms - for (icalcomponent *alarm = icalcomponent_get_first_component(tqparent,ICAL_VALARM_COMPONENT); + for (icalcomponent *alarm = icalcomponent_get_first_component(parent,ICAL_VALARM_COMPONENT); alarm; - alarm = icalcomponent_get_next_component(tqparent,ICAL_VALARM_COMPONENT)) { + alarm = icalcomponent_get_next_component(parent,ICAL_VALARM_COMPONENT)) { readAlarm(alarm,incidence); } // Fix incorrect alarm settings by other applications (like outloook 9) @@ -1548,9 +1548,9 @@ void ICalFormatImpl::readIncidence(icalcomponent *tqparent, icaltimezone *tz, In } -void ICalFormatImpl::readIncidenceBase(icalcomponent *tqparent,IncidenceBase *incidenceBase) +void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *incidenceBase) { - icalproperty *p = icalcomponent_get_first_property(tqparent,ICAL_ANY_PROPERTY); + icalproperty *p = icalcomponent_get_first_property(parent,ICAL_ANY_PROPERTY); bool uidProcessed = false; @@ -1580,7 +1580,7 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *tqparent,IncidenceBase *in break; } - p = icalcomponent_get_next_property( tqparent, ICAL_ANY_PROPERTY ); + p = icalcomponent_get_next_property( parent, ICAL_ANY_PROPERTY ); } if ( !uidProcessed ) { @@ -1604,35 +1604,35 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *tqparent,IncidenceBase *in // (documented in UsingLibical.txt) icalproperty *next =0; - for ( p = icalcomponent_get_first_property(tqparent,ICAL_X_PROPERTY); + for ( p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY); p != 0; p = next ) { - next = icalcomponent_get_next_property(tqparent,ICAL_X_PROPERTY); + next = icalcomponent_get_next_property(parent,ICAL_X_PROPERTY); TQString value = TQString::fromUtf8(icalproperty_get_x(p)); TQString name = icalproperty_get_x_name(p); if (name == "X-PILOTID" && !value.isEmpty()) { incidenceBase->setPilotId(value.toInt()); - icalcomponent_remove_property(tqparent,p); + icalcomponent_remove_property(parent,p); } else if (name == "X-PILOTSTAT" && !value.isEmpty()) { incidenceBase->setSynctqStatus(value.toInt()); - icalcomponent_remove_property(tqparent,p); + icalcomponent_remove_property(parent,p); } } // custom properties - readCustomProperties(tqparent, incidenceBase); + readCustomProperties(parent, incidenceBase); } -void ICalFormatImpl::readCustomProperties(icalcomponent *tqparent,CustomProperties *properties) +void ICalFormatImpl::readCustomProperties(icalcomponent *parent,CustomProperties *properties) { TQMap<TQCString, TQString> customProperties; TQString lastProperty; - icalproperty *p = icalcomponent_get_first_property(tqparent,ICAL_X_PROPERTY); + icalproperty *p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY); while (p) { @@ -1644,7 +1644,7 @@ void ICalFormatImpl::readCustomProperties(icalcomponent *tqparent,CustomProperti customProperties[name] = customProperties[name].append( "," ).append( value ); } // kdDebug(5800) << "Set custom property [" << name << '=' << value << ']' << endl; - p = icalcomponent_get_next_property(tqparent,ICAL_X_PROPERTY); + p = icalcomponent_get_next_property(parent,ICAL_X_PROPERTY); lastProperty = name; } @@ -2177,9 +2177,9 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) printf("FIXME! [WARNING] Parent for child event does not yet exist!\n\r"); } else { - // Add this todo to its tqparent + // Add this todo to its parent cal->todo(originalUid)->addChildIncidence(todo->uid()); - // And the tqparent to the child + // And the parent to the child todo->addChildIncidence(cal->todo(originalUid)->uid()); } } @@ -2215,9 +2215,9 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) printf("FIXME! [WARNING] Parent for child event does not yet exist!\n\r"); } else { - // Add this event to its tqparent + // Add this event to its parent cal->event(originalUid)->addChildIncidence(event->uid()); - // And the tqparent to the child + // And the parent to the child event->addChildIncidence(cal->event(originalUid)->uid()); } } @@ -2253,9 +2253,9 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) printf("FIXME! [WARNING] Parent for child event does not yet exist!\n\r"); } else { - // Add this journal to its tqparent + // Add this journal to its parent cal->journal(originalUid)->addChildIncidence(journal->uid()); - // And the tqparent to the child + // And the parent to the child journal->addChildIncidence(cal->journal(originalUid)->uid()); } } diff --git a/libkcal/icalformatimpl.h b/libkcal/icalformatimpl.h index 215adfe9b..9a2e9f623 100644 --- a/libkcal/icalformatimpl.h +++ b/libkcal/icalformatimpl.h @@ -46,7 +46,7 @@ class ICalFormatImpl { public: /** Create new iCal format for calendar object */ - ICalFormatImpl( ICalFormat *tqparent ); + ICalFormatImpl( ICalFormat *parent ); virtual ~ICalFormatImpl(); bool populate( Calendar *, icalcomponent *fs); @@ -57,7 +57,7 @@ class ICalFormatImpl icalcomponent *writeFreeBusy(FreeBusy *freebusy, Scheduler::Method method = Scheduler::Publish ); icalcomponent *writeJournal(Journal *journal); - void writeIncidence(icalcomponent *tqparent,Incidence *incidence); + void writeIncidence(icalcomponent *parent,Incidence *incidence); icalproperty *writeAttendee(Attendee *attendee); icalproperty *writeOrganizer( const Person &organizer ); icalproperty *writeAttachment(Attachment *attach); @@ -73,7 +73,7 @@ class ICalFormatImpl Attendee *readAttendee(icalproperty *attendee); Person readOrganizer( icalproperty *organizer ); Attachment *readAttachment(icalproperty *attach); - void readIncidence(icalcomponent *tqparent, icaltimezone *timezone, Incidence *incidence); + void readIncidence(icalcomponent *parent, icaltimezone *timezone, Incidence *incidence); void readRecurrenceRule(icalproperty *rrule,Incidence *event ); void readExceptionRule( icalproperty *rrule, Incidence *incidence ); void readRecurrence( const struct icalrecurrencetype &r, RecurrenceRule* recur ); @@ -96,10 +96,10 @@ class ICalFormatImpl protected: void dumpIcalRecurrence(icalrecurrencetype); private: - void writeIncidenceBase(icalcomponent *tqparent,IncidenceBase *); - void readIncidenceBase(icalcomponent *tqparent, IncidenceBase *); - void writeCustomProperties(icalcomponent *tqparent,CustomProperties *); - void readCustomProperties(icalcomponent *tqparent,CustomProperties *); + void writeIncidenceBase(icalcomponent *parent,IncidenceBase *); + void readIncidenceBase(icalcomponent *parent, IncidenceBase *); + void writeCustomProperties(icalcomponent *parent,CustomProperties *); + void readCustomProperties(icalcomponent *parent,CustomProperties *); void readTimezone(icalcomponent *vtimezone); ICalFormat *mParent; diff --git a/libkcal/incidence.h b/libkcal/incidence.h index bfb883fd2..8b6ddd1a8 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h @@ -459,14 +459,14 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ TQDateTime recurrenceID() const; /** - Attach a child incidence to a tqparent incidence. + Attach a child incidence to a parent incidence. @param childIncidence is the child incidence to add @since 3.5.12 */ void addChildIncidence( TQString childIncidence ); /** - Detach a child incidence from its tqparent incidence. + Detach a child incidence from its parent incidence. @param childIncidence is the child incidence to remove @since 3.5.12 */ diff --git a/libkcal/recurrence.h b/libkcal/recurrence.h index f50be8bd5..122e6d62c 100644 --- a/libkcal/recurrence.h +++ b/libkcal/recurrence.h @@ -308,7 +308,7 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer * @return Weekday of the first day of the week (Monday=1 .. Sunday=7) */ int weekStart() const; - /** Returns week day tqmask (bit 0 = Monday). */ + /** Returns week day mask (bit 0 = Monday). */ TQBitArray days() const; // Emulate the old behavior /** Sets an event to recur monthly. By default infinite recurrence is used. diff --git a/libkcal/recurrencerule.h b/libkcal/recurrencerule.h index 14335a0b6..4d8139070 100644 --- a/libkcal/recurrencerule.h +++ b/libkcal/recurrencerule.h @@ -199,7 +199,7 @@ class LIBKCAL_EXPORT RecurrenceRule // Bounded by -366 and +366, 0 means all weeks in that period }; - RecurrenceRule( /*Incidence *tqparent, int compatVersion = 0*/ ); + RecurrenceRule( /*Incidence *parent, int compatVersion = 0*/ ); RecurrenceRule(const RecurrenceRule&); ~RecurrenceRule(); @@ -207,7 +207,7 @@ class LIBKCAL_EXPORT RecurrenceRule bool operator!=( const RecurrenceRule& r ) const { return !operator==(r); } RecurrenceRule &operator=(const RecurrenceRule&); -// Incidence *tqparent() const { return mParent; } +// Incidence *parent() const { return mParent; } /** Set if recurrence is read-only or can be changed. */ diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index 0e9f34052..bab09728b 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -518,8 +518,8 @@ void ResourceCached::calendarIncidenceDeleted( Incidence *i ) #endif if (i->hasRecurrenceID()) { - // This incidence has a tqparent; notify the tqparent of the child's death and do not destroy the tqparent! - // Get the tqparent + // This incidence has a parent; notify the parent of the child's death and do not destroy the parent! + // Get the parent IncidenceList il = i->childIncidences(); IncidenceListIterator it; it = il.begin(); diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp index b230f5bb9..caa1fddf8 100644 --- a/libkcal/resourcecachedconfig.cpp +++ b/libkcal/resourcecachedconfig.cpp @@ -35,9 +35,9 @@ using namespace KCal; -ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *tqparent, +ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -75,9 +75,9 @@ void ResourceCachedReloadConfig::slotIntervalStateChanged( int state ) } -ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *tqparent, +ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h index 16364f42f..13ea648bf 100644 --- a/libkcal/resourcecachedconfig.h +++ b/libkcal/resourcecachedconfig.h @@ -41,7 +41,7 @@ class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget Q_OBJECT TQ_OBJECT public: - ResourceCachedReloadConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceCachedReloadConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: void loadSettings( ResourceCached *resource ); @@ -68,7 +68,7 @@ class KDE_EXPORT ResourceCachedSaveConfig : public TQWidget Q_OBJECT TQ_OBJECT public: - ResourceCachedSaveConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceCachedSaveConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: void loadSettings( ResourceCached *resource ); diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index 03318737d..ef1acb2d1 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -386,10 +386,10 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource virtual bool removeSubresource( const TQString& resource ); /** - * Add a subresource with the name @param resource and the tqparent - * id @param tqparent. + * Add a subresource with the name @param resource and the parent + * id @param parent. */ - virtual bool addSubresource( const TQString& resource, const TQString& tqparent ); + virtual bool addSubresource( const TQString& resource, const TQString& parent ); /** * Returns the type of the subresource: "event", "todo" or "journal", diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index 29d879da5..e237037c2 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -40,8 +40,8 @@ using namespace KCal; -ResourceLocalConfig::ResourceLocalConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceLocalConfig::ResourceLocalConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 ); diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h index fbd0d00f0..f6cba16f2 100644 --- a/libkcal/resourcelocalconfig.h +++ b/libkcal/resourcelocalconfig.h @@ -44,7 +44,7 @@ class LIBKCAL_EXPORT ResourceLocalConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - ResourceLocalConfig( TQWidget* tqparent = 0, const char* name = 0 ); + ResourceLocalConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource); diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp index 263d1ce25..df2412b3d 100644 --- a/libkcal/resourcelocaldirconfig.cpp +++ b/libkcal/resourcelocaldirconfig.cpp @@ -39,8 +39,8 @@ using namespace KCal; -ResourceLocalDirConfig::ResourceLocalDirConfig( TQWidget* tqparent, const char* name ) - : KRES::ConfigWidget( tqparent, name ) +ResourceLocalDirConfig::ResourceLocalDirConfig( TQWidget* parent, const char* name ) + : KRES::ConfigWidget( parent, name ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 ); diff --git a/libkcal/resourcelocaldirconfig.h b/libkcal/resourcelocaldirconfig.h index df1e682b8..3866e9cc1 100644 --- a/libkcal/resourcelocaldirconfig.h +++ b/libkcal/resourcelocaldirconfig.h @@ -46,7 +46,7 @@ class LIBKCAL_EXPORT ResourceLocalDirConfig : public KRES::ConfigWidget Q_OBJECT TQ_OBJECT public: - ResourceLocalDirConfig( TQWidget *tqparent = 0, const char *name = 0 ); + ResourceLocalDirConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource); diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index 481a33a6a..e4f03a01a 100644 --- a/libkcal/scheduler.cpp +++ b/libkcal/scheduler.cpp @@ -330,13 +330,13 @@ bool Scheduler::acceptRequest( IncidenceBase *incidence, return false; } - // FIXME: This is a nasty hack, since we need to set a tqparent for the + // FIXME: This is a nasty hack, since we need to set a parent for the // resource selection dialog. However, we don't have any UI methods // in the calendar, only in the CalendarResources::DestinationPolicy // So we need to type-cast it and extract it from the CalendarResources - TQWidget *tmptqparent = 0; + TQWidget *tmpparent = 0; if ( stdcal ) { - tmptqparent = stdcal->dialogParentWidget(); + tmpparent = stdcal->dialogParentWidget(); stdcal->setDialogParentWidget( 0 ); } diff --git a/libkcal/vcaldrag.cpp b/libkcal/vcaldrag.cpp index 590263ab9..853c5187e 100644 --- a/libkcal/vcaldrag.cpp +++ b/libkcal/vcaldrag.cpp @@ -26,8 +26,8 @@ using namespace KCal; -VCalDrag::VCalDrag( Calendar *cal, TQWidget *tqparent, const char *name ) - : TQStoredDrag( "text/x-vCalendar", tqparent, name ) +VCalDrag::VCalDrag( Calendar *cal, TQWidget *parent, const char *name ) + : TQStoredDrag( "text/x-vCalendar", parent, name ) { VCalFormat format; setEncodedData( format.toString( cal ).utf8() ); diff --git a/libkcal/vcaldrag.h b/libkcal/vcaldrag.h index c139827af..7cb8c6bbd 100644 --- a/libkcal/vcaldrag.h +++ b/libkcal/vcaldrag.h @@ -38,7 +38,7 @@ class KDE_EXPORT VCalDrag : public TQStoredDrag /** Create a drag&drop object for vCalendar component \a vcal. */ - VCalDrag( Calendar *vcal, TQWidget *tqparent = 0, const char *name = 0 ); + VCalDrag( Calendar *vcal, TQWidget *parent = 0, const char *name = 0 ); ~VCalDrag() {} /** diff --git a/libkcal/versit/readme.txt b/libkcal/versit/readme.txt index c03ba9b53..e51acb6dd 100644 --- a/libkcal/versit/readme.txt +++ b/libkcal/versit/readme.txt @@ -229,9 +229,9 @@ VObject tree can be pretty printed with the printVObject() function. The output of pretty printing a VObject representation of the input test file "vobject.vcf" is shown below. Note that the indentation indicates the tree hirerarchy where the immediate tqchildren nodes -of a tqparent node is all at the same indentation level and the +of a parent node is all at the same indentation level and the immediate tqchildren nodes are the immediate properties of the -associated tqparent nodes. In the following, {N,FN,ORG,TITLE,...} +associated parent nodes. In the following, {N,FN,ORG,TITLE,...} are immediate properties of VCARD. {F and G} are properties of N with value {"Alden" and "Roland"} respectively; FN has no property but has the value "Roland H. Alden"; EMAIL has value and diff --git a/libkdenetwork/gpgmepp/encryptionresult.cpp b/libkdenetwork/gpgmepp/encryptionresult.cpp index cad520baa..f827ca839 100644 --- a/libkdenetwork/gpgmepp/encryptionresult.cpp +++ b/libkdenetwork/gpgmepp/encryptionresult.cpp @@ -94,8 +94,8 @@ std::vector<GpgME::InvalidRecipient> GpgME::EncryptionResult::invalidEncryptionK -GpgME::InvalidRecipient::InvalidRecipient( EncryptionResult::Private * tqparent, unsigned int i ) - : d( tqparent ), idx( i ) +GpgME::InvalidRecipient::InvalidRecipient( EncryptionResult::Private * parent, unsigned int i ) + : d( parent ), idx( i ) { if ( d ) d->ref(); diff --git a/libkdenetwork/gpgmepp/encryptionresult.h b/libkdenetwork/gpgmepp/encryptionresult.h index 0624779d2..7267afc01 100644 --- a/libkdenetwork/gpgmepp/encryptionresult.h +++ b/libkdenetwork/gpgmepp/encryptionresult.h @@ -59,7 +59,7 @@ namespace GpgME { class KDE_EXPORT InvalidRecipient { friend class EncryptionResult; - InvalidRecipient( EncryptionResult::Private * tqparent, unsigned int index ); + InvalidRecipient( EncryptionResult::Private * parent, unsigned int index ); public: InvalidRecipient(); InvalidRecipient( const InvalidRecipient & other ); diff --git a/libkdenetwork/gpgmepp/importresult.cpp b/libkdenetwork/gpgmepp/importresult.cpp index 7acd35e4c..3b4b713c7 100644 --- a/libkdenetwork/gpgmepp/importresult.cpp +++ b/libkdenetwork/gpgmepp/importresult.cpp @@ -140,8 +140,8 @@ std::vector<GpgME::Import> GpgME::ImportResult::imports() const { -GpgME::Import::Import( ImportResult::Private * tqparent, unsigned int i ) - : d( tqparent ), idx( i ) +GpgME::Import::Import( ImportResult::Private * parent, unsigned int i ) + : d( parent ), idx( i ) { if ( d ) d->ref(); diff --git a/libkdenetwork/gpgmepp/importresult.h b/libkdenetwork/gpgmepp/importresult.h index eae58a5dc..9a79b7b30 100644 --- a/libkdenetwork/gpgmepp/importresult.h +++ b/libkdenetwork/gpgmepp/importresult.h @@ -70,7 +70,7 @@ namespace GpgME { class KDE_EXPORT Import { friend class ImportResult; - Import( ImportResult::Private * tqparent, unsigned int idx ); + Import( ImportResult::Private * parent, unsigned int idx ); public: Import(); Import( const Import & other ); diff --git a/libkdenetwork/gpgmepp/key.cpp b/libkdenetwork/gpgmepp/key.cpp index d24a1d644..13cd0a7ee 100644 --- a/libkdenetwork/gpgmepp/key.cpp +++ b/libkdenetwork/gpgmepp/key.cpp @@ -348,7 +348,7 @@ namespace GpgME { return !d || !d->key || !d->subkey; } - Key Subkey::tqparent() const { + Key Subkey::parent() const { return Key( d->key, true ); } @@ -496,7 +496,7 @@ namespace GpgME { return !d || !d->key || !d->uid; } - Key UserID::tqparent() const { + Key UserID::parent() const { return Key( d->key, true ); } @@ -669,7 +669,7 @@ namespace GpgME { return !d || !d->key || !d->uid || !d->sig; } - UserID UserID::Signature::tqparent() const { + UserID UserID::Signature::parent() const { return UserID( d->key, d->uid ); } @@ -911,7 +911,7 @@ namespace GpgME { return !d || !d->key || !d->uid || !d->sig || !d->nota; } - UserID::Signature UserID::Signature::Notation::tqparent() const { + UserID::Signature UserID::Signature::Notation::parent() const { return Signature( d->key, d->uid, d->sig ); } diff --git a/libkdenetwork/gpgmepp/key.h b/libkdenetwork/gpgmepp/key.h index 9760e6429..e143b47e0 100644 --- a/libkdenetwork/gpgmepp/key.h +++ b/libkdenetwork/gpgmepp/key.h @@ -123,7 +123,7 @@ namespace GpgME { bool isNull() const; - Key tqparent() const; + Key parent() const; const char * keyID() const; const char * fingerprint() const; @@ -171,7 +171,7 @@ namespace GpgME { bool isNull() const; - Key tqparent() const; + Key parent() const; unsigned int numSignatures() const; Signature signature( unsigned int index ) const; @@ -213,7 +213,7 @@ namespace GpgME { bool isNull() const; - UserID tqparent() const; + UserID parent() const; const char * signerKeyID() const; @@ -270,7 +270,7 @@ namespace GpgME { bool isNull() const; - Signature tqparent() const; + Signature parent() const; const char * name() const; const char * value() const; diff --git a/libkdenetwork/gpgmepp/signingresult.cpp b/libkdenetwork/gpgmepp/signingresult.cpp index 6dab4d71d..6996eef7a 100644 --- a/libkdenetwork/gpgmepp/signingresult.cpp +++ b/libkdenetwork/gpgmepp/signingresult.cpp @@ -116,8 +116,8 @@ std::vector<GpgME::InvalidSigningKey> GpgME::SigningResult::invalidSigningKeys() -GpgME::InvalidSigningKey::InvalidSigningKey( SigningResult::Private * tqparent, unsigned int i ) - : d( tqparent ), idx( i ) +GpgME::InvalidSigningKey::InvalidSigningKey( SigningResult::Private * parent, unsigned int i ) + : d( parent ), idx( i ) { if ( d ) d->ref(); @@ -165,8 +165,8 @@ GpgME::Error GpgME::InvalidSigningKey::reason() const { -GpgME::CreatedSignature::CreatedSignature( SigningResult::Private * tqparent, unsigned int i ) - : d( tqparent ), idx( i ) +GpgME::CreatedSignature::CreatedSignature( SigningResult::Private * parent, unsigned int i ) + : d( parent ), idx( i ) { if ( d ) d->ref(); diff --git a/libkdenetwork/gpgmepp/signingresult.h b/libkdenetwork/gpgmepp/signingresult.h index facf8979b..202d09b41 100644 --- a/libkdenetwork/gpgmepp/signingresult.h +++ b/libkdenetwork/gpgmepp/signingresult.h @@ -64,7 +64,7 @@ namespace GpgME { class KDE_EXPORT InvalidSigningKey { friend class SigningResult; - InvalidSigningKey( SigningResult::Private * tqparent, unsigned int index ); + InvalidSigningKey( SigningResult::Private * parent, unsigned int index ); public: InvalidSigningKey(); InvalidSigningKey( const InvalidSigningKey & other ); @@ -86,7 +86,7 @@ namespace GpgME { class KDE_EXPORT CreatedSignature { friend class SigningResult; - CreatedSignature( SigningResult::Private * tqparent, unsigned int index ); + CreatedSignature( SigningResult::Private * parent, unsigned int index ); public: class Notation; diff --git a/libkdenetwork/gpgmepp/verificationresult.cpp b/libkdenetwork/gpgmepp/verificationresult.cpp index e4f905d83..757514d8c 100644 --- a/libkdenetwork/gpgmepp/verificationresult.cpp +++ b/libkdenetwork/gpgmepp/verificationresult.cpp @@ -121,8 +121,8 @@ std::vector<GpgME::Signature> GpgME::VerificationResult::signatures() const { -GpgME::Signature::Signature( VerificationResult::Private * tqparent, unsigned int i ) - : d( tqparent ), idx( i ) +GpgME::Signature::Signature( VerificationResult::Private * parent, unsigned int i ) + : d( parent ), idx( i ) { if ( d ) d->ref(); @@ -253,8 +253,8 @@ std::vector<GpgME::Signature::Notation> GpgME::Signature::notations() const { } -GpgME::Signature::Notation::Notation( VerificationResult::Private * tqparent, unsigned int sindex, unsigned int nindex ) - : d( tqparent ), sidx( sindex ), nidx( nindex ) +GpgME::Signature::Notation::Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex ) + : d( parent ), sidx( sindex ), nidx( nindex ) { if ( d ) d->ref(); diff --git a/libkdenetwork/gpgmepp/verificationresult.h b/libkdenetwork/gpgmepp/verificationresult.h index c5c14aab9..edcd02787 100644 --- a/libkdenetwork/gpgmepp/verificationresult.h +++ b/libkdenetwork/gpgmepp/verificationresult.h @@ -59,7 +59,7 @@ namespace GpgME { class KDE_EXPORT Signature { friend class VerificationResult; - Signature( VerificationResult::Private * tqparent, unsigned int index ); + Signature( VerificationResult::Private * parent, unsigned int index ); public: class Notation; @@ -118,7 +118,7 @@ namespace GpgME { class KDE_EXPORT Signature::Notation { friend class Signature; - Notation( VerificationResult::Private * tqparent, unsigned int sindex, unsigned int nindex ); + Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex ); public: Notation(); Notation( const Notation & other ); diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c index a4dc17add..8ee9c748b 100644 --- a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c +++ b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c @@ -86,7 +86,7 @@ fix_signals (void) if (act.sa_handler == SIG_DFL) { act.sa_handler = SIG_IGN; - sigemptyset (&act.sa_tqmask); + sigemptyset (&act.sa_mask); act.sa_flags = 0; sigaction (SIGPIPE, &act, NULL); } @@ -337,7 +337,7 @@ pipe_connect_unix (assuan_context_t *ctx, unsetenv ("_assuan_connection_fd"); execv (name, (char *const *) argv); - /* oops - use the pipe to tell the tqparent about it */ + /* oops - use the pipe to tell the parent about it */ snprintf (errbuf, sizeof(errbuf)-1, "ERR %d can't exec `%s': %.50s\n", _assuan_error (ASSUAN_Problem_Starting_Server), @@ -519,7 +519,7 @@ socketpair_connect (assuan_context_t *ctx, } execv (name, (char *const *) argv); - /* oops - use the pipe to tell the tqparent about it */ + /* oops - use the pipe to tell the parent about it */ snprintf (errbuf, sizeof(errbuf)-1, "ERR %d can't exec `%s': %.50s\n", _assuan_error (ASSUAN_Problem_Starting_Server), @@ -865,7 +865,7 @@ assuan_pipe_connect2 (assuan_context_t *ctx, If NAME as well as ARGV are NULL, no exec is done but the same process is continued. However all file descriptors are closed and some special environment variables are set. To let the caller - detect whether the child or the tqparent continues, the child returns + detect whether the child or the parent continues, the child returns a CTX of NULL. */ assuan_error_t assuan_pipe_connect_ext (assuan_context_t *ctx, diff --git a/libkdenetwork/libgpgme-copy/gpgme/ChangeLog b/libkdenetwork/libgpgme-copy/gpgme/ChangeLog index 4f1038fb3..85fd28d30 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/ChangeLog +++ b/libkdenetwork/libgpgme-copy/gpgme/ChangeLog @@ -2648,11 +2648,11 @@ 2002-11-25 Marcus Brinkmann <marcus@g10code.de> - * rungpg.c (_gpgme_gpg_spawn): Do not set tqparent fds to -1. + * rungpg.c (_gpgme_gpg_spawn): Do not set parent fds to -1. * posix-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead close - for tqparent fds. + for parent fds. * w32-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead - CloseHandle for tqparent fds. + CloseHandle for parent fds. 2002-11-22 Marcus Brinkmann <marcus@g10code.de> @@ -4634,7 +4634,7 @@ 2001-11-23 Marcus Brinkmann <marcus@g10code.de> - * engine-gpgsm.c (_gpgme_gpgsm_new): Set CLOEXEC flag for tqparent + * engine-gpgsm.c (_gpgme_gpgsm_new): Set CLOEXEC flag for parent ends of the pipe. 2001-11-22 Marcus Brinkmann <marcus@g10code.de> diff --git a/libkdenetwork/libgpgme-copy/gpgme/io.h b/libkdenetwork/libgpgme-copy/gpgme/io.h index 33dc5d9a1..47b748f8b 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/io.h +++ b/libkdenetwork/libgpgme-copy/gpgme/io.h @@ -50,7 +50,7 @@ int _gpgme_io_set_close_notify (int fd, void (*handler) (int, void *), int _gpgme_io_set_nonblocking (int fd); /* Spawn the executable PATH with ARGV as arguments, after forking - close all fds in FD_PARENT_LIST in the tqparent and close or dup all + close all fds in FD_PARENT_LIST in the parent and close or dup all 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, diff --git a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c index 83d661695..4f91ef2bd 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c +++ b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c @@ -70,7 +70,7 @@ __memrchr (s, c_in, n) { const unsigned char *char_ptr; const unsigned long int *longword_ptr; - unsigned long int longword, magic_bits, chartqmask; + unsigned long int longword, magic_bits, charmask; unsigned reg_char c; c = (unsigned char) c_in; @@ -109,10 +109,10 @@ __memrchr (s, c_in, n) #endif /* Set up a longword, each of whose bytes is C. */ - chartqmask = c | (c << 8); - chartqmask |= chartqmask << 16; + charmask = c | (c << 8); + charmask |= charmask << 16; #if LONG_MAX > LONG_MAX_32_BITS - chartqmask |= chartqmask << 32; + charmask |= charmask << 32; #endif /* Instead of the traditional loop which tests each character, @@ -154,7 +154,7 @@ __memrchr (s, c_in, n) each of whose bytes is C. This turns each byte that is C into a zero. */ - longword = *--longword_ptr ^ chartqmask; + longword = *--longword_ptr ^ charmask; /* Add MAGIC_BITS to LONGWORD. */ if ((((longword + magic_bits) diff --git a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c index 3c9fa4b13..7f3b80e70 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c +++ b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c @@ -50,7 +50,7 @@ _gpgme_io_subsystem_init (void) if (act.sa_handler == SIG_DFL) { act.sa_handler = SIG_IGN; - sigemptyset (&act.sa_tqmask); + sigemptyset (&act.sa_mask); act.sa_flags = 0; sigaction (SIGPIPE, &act, NULL); } @@ -299,7 +299,7 @@ _gpgme_io_spawn (const char *path, char **argv, if (status) return -1; - /* .dup_to is not used in the tqparent list. */ + /* .dup_to is not used in the parent list. */ for (i = 0; fd_parent_list[i].fd != -1; i++) _gpgme_io_close (fd_parent_list[i].fd); diff --git a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h index 1d05ba03f..9a908570f 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h +++ b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h @@ -52,7 +52,7 @@ int _gpgme_io_set_close_notify (int fd, void (*handler) (int, void *), int _gpgme_io_set_nonblocking (int fd); /* Spawn the executable PATH with ARGV as arguments, after forking - close all fds in FD_PARENT_LIST in the tqparent and close or dup all + close all fds in FD_PARENT_LIST in the parent and close or dup all 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, diff --git a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c index 1a25dac00..d09cdf3b6 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c +++ b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c @@ -1269,7 +1269,7 @@ start (engine_gpg_t gpg) fd_child_list[n].fd = -1; fd_child_list[n].dup_to = -1; - /* Build the fd list for the tqparent. */ + /* Build the fd list for the parent. */ n = 0; if (gpg->status.fd[1] != -1) { diff --git a/libkdenetwork/qgpgme/eventloopinteractor.cpp b/libkdenetwork/qgpgme/eventloopinteractor.cpp index a773860e1..fdf25af04 100644 --- a/libkdenetwork/qgpgme/eventloopinteractor.cpp +++ b/libkdenetwork/qgpgme/eventloopinteractor.cpp @@ -32,10 +32,10 @@ using namespace GpgME; -QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), GpgME::EventLoopInteractor() +QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char * name ) + : TQObject( parent, name ), GpgME::EventLoopInteractor() { - if ( !tqparent ) + if ( !parent ) if ( tqApp ) { connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) ); diff --git a/libkdenetwork/qgpgme/eventloopinteractor.h b/libkdenetwork/qgpgme/eventloopinteractor.h index e1d514f5c..2a36993a0 100644 --- a/libkdenetwork/qgpgme/eventloopinteractor.h +++ b/libkdenetwork/qgpgme/eventloopinteractor.h @@ -39,7 +39,7 @@ namespace QGpgME { Q_OBJECT TQ_OBJECT protected: - EventLoopInteractor( TQObject * tqparent, const char * name=0 ); + EventLoopInteractor( TQObject * parent, const char * name=0 ); public: virtual ~EventLoopInteractor(); diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp index 63473a6f1..2a4613763 100644 --- a/libkdepim/addresseelineedit.cpp +++ b/libkdepim/addresseelineedit.cpp @@ -109,9 +109,9 @@ static bool itemIsHeader( const TQListBoxItem* item ) -AddresseeLineEdit::AddresseeLineEdit( TQWidget* tqparent, bool useCompletion, +AddresseeLineEdit::AddresseeLineEdit( TQWidget* parent, bool useCompletion, const char *name ) - : ClickLineEdit( tqparent, TQString(), name ), DCOPObject( newLineEditDCOPObjectName() ), + : ClickLineEdit( parent, TQString(), name ), DCOPObject( newLineEditDCOPObjectName() ), m_useSemiColonAsSeparator( false ), m_allowDistLists( true ) { m_useCompletion = useCompletion; @@ -1047,7 +1047,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) TQListBoxItem *item = completionBox()->itemAt( me->pos() ); if ( !item ) { // In the case of a mouse move outside of the box we don't want - // the tqparent to fuzzy select a header by mistake. + // the parent to fuzzy select a header by mistake. bool eat = e->type() == TQEvent::MouseMove; return eat; } diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h index 416af1671..4cc893e4c 100644 --- a/libkdepim/addresseelineedit.h +++ b/libkdepim/addresseelineedit.h @@ -57,7 +57,7 @@ class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject TQ_OBJECT public: - AddresseeLineEdit( TQWidget* tqparent, bool useCompletion = true, + AddresseeLineEdit( TQWidget* parent, bool useCompletion = true, const char *name = 0L); virtual ~AddresseeLineEdit(); diff --git a/libkdepim/addresseeselector.cpp b/libkdepim/addresseeselector.cpp index d947baa1a..3b81327fa 100644 --- a/libkdepim/addresseeselector.cpp +++ b/libkdepim/addresseeselector.cpp @@ -187,9 +187,9 @@ uint SelectionItem::index() const class SelectionViewItem : public TQListViewItem { public: - SelectionViewItem( TQListView *tqparent, Selection *selection, + SelectionViewItem( TQListView *parent, Selection *selection, SelectionItem *item ) - : TQListViewItem( tqparent, "" ), mSelection( selection ), mItem( item ) + : TQListViewItem( parent, "" ), mSelection( selection ), mItem( item ) { if ( mItem->distributionList() == 0 ) mIcon = mSelection->itemIcon( mItem->addressee(), mItem->index() ); @@ -224,8 +224,8 @@ class SelectionViewItem : public TQListViewItem TQPixmap mIcon; }; -AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mSelection( selection ), mManager( 0 ) +AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mSelection( selection ), mManager( 0 ) { mMoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); mRemoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); @@ -561,8 +561,8 @@ void AddresseeSelector::reloadAddressBook() AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection, - TQWidget *tqparent, const char *name ) - : KDialogBase( Plain, "", Ok | Cancel, Ok, tqparent, name, true ) + TQWidget *parent, const char *name ) + : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true ) { TQFrame *frame = plainPage(); TQVBoxLayout *tqlayout = new TQVBoxLayout( frame ); diff --git a/libkdepim/addresseeselector.h b/libkdepim/addresseeselector.h index 2b4771a19..00949d74a 100644 --- a/libkdepim/addresseeselector.h +++ b/libkdepim/addresseeselector.h @@ -170,7 +170,7 @@ class KDE_EXPORT AddresseeSelector : public TQWidget public: AddresseeSelector( Selection *selection, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); ~AddresseeSelector(); /** @@ -220,7 +220,7 @@ class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase public: AddresseeSelectorDialog( Selection *selection, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); protected slots: void accept(); diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index 82f0305e1..786beb1ca 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/addresseeview.cpp @@ -50,9 +50,9 @@ using namespace KPIM; -AddresseeView::AddresseeView( TQWidget *tqparent, const char *name, +AddresseeView::AddresseeView( TQWidget *parent, const char *name, KConfig *config ) - : KTextBrowser( tqparent, name ), mDefaultConfig( false ), mImageJob( 0 ), + : KTextBrowser( parent, name ), mDefaultConfig( false ), mImageJob( 0 ), mLinkMask( AddressLinks | EmailLinks | PhoneLinks | URLLinks | IMLinks | CustomFields ) { setWrapPolicy( TQTextEdit::AtWordBoundary ); diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h index 09e17887d..022d1efef 100644 --- a/libkdepim/addresseeview.h +++ b/libkdepim/addresseeview.h @@ -51,7 +51,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser @param config The config object where the settings are stored which fields will be shown. */ - AddresseeView( TQWidget *tqparent = 0, const char *name = 0, + AddresseeView( TQWidget *parent = 0, const char *name = 0, KConfig *config = 0 ); ~AddresseeView(); @@ -85,7 +85,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser /** Sets which parts of the contact shall be presented as links. - The tqmask can be OR'ed LinkMask. By default all links are enabled. + The mask can be OR'ed LinkMask. By default all links are enabled. */ void enableLinks( int linkMask ); @@ -115,7 +115,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser </div> @param addr The addressee object. - @param linkMask The tqmask for which parts of the contact will + @param linkMask The mask for which parts of the contact will be displayed as links. The links looks like this: "addr://<addr id>" for addresses @@ -125,7 +125,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser "im:<im addrss>" for instant messaging addresses "sms://<phone number>" for sending a sms @param internalLoading If true, the loading of internal pictures is done automatically. - @param fieldMask The tqmask for which fields of the contact will + @param fieldMask The mask for which fields of the contact will be displayed. */ static TQString vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask = DefaultLinks, diff --git a/libkdepim/addressesdialog.cpp b/libkdepim/addressesdialog.cpp index d73ab63f8..8efadd400 100644 --- a/libkdepim/addressesdialog.cpp +++ b/libkdepim/addressesdialog.cpp @@ -91,9 +91,9 @@ struct AddressesDialog::AddressesDialogPrivate { }; // privates end -AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const KABC::Addressee& addr, +AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, int emailIndex ) - : TQObject( 0 ), KListViewItem( tqparent, addr.realName(), + : TQObject( 0 ), KListViewItem( parent, addr.realName(), ( emailIndex == 0 ? addr.preferredEmail() : addr.emails()[ emailIndex ] ) ) { d = new AddresseeViewItemPrivate; @@ -120,17 +120,17 @@ AddresseeViewItem::AddresseeViewItem( KListView *lv, const TQString& name, Categ d->category = cat; } -AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name, +AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const KABC::Addressee::List &lst ) - : TQObject(0), KListViewItem( tqparent, name, i18n("<group>") ) + : TQObject(0), KListViewItem( parent, name, i18n("<group>") ) { d = new AddresseeViewItemPrivate; d->category = FilledGroup; d->addresses = lst; } -AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name ) - : TQObject(0), KListViewItem( tqparent, name, i18n("<group>") ) +AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name ) + : TQObject(0), KListViewItem( parent, name, i18n("<group>") ) { d = new AddresseeViewItemPrivate; d->category = DistList; @@ -544,12 +544,12 @@ AddressesDialog::availableAddressSelected( AddresseeViewItem* item, bool selecte void AddressesDialog::selectedAddressSelected( AddresseeViewItem* item, bool selected ) { - // we have to avoid that a tqparent and a child is selected together + // we have to avoid that a parent and a child is selected together // because in this case we get a double object deletion ( program crashes ) // when removing the selected items from list - AddresseeViewItem* tqparent = static_cast<AddresseeViewItem*>(((TQListViewItem*)item)->tqparent()); - if ( tqparent && selected ) - tqparent->setSelected( false ); + AddresseeViewItem* parent = static_cast<AddresseeViewItem*>(((TQListViewItem*)item)->parent()); + if ( parent && selected ) + parent->setSelected( false ); if (selected) { selectedSelectedAddresses.append(item); @@ -662,10 +662,10 @@ AddressesDialog::addAddresseeToSelected( const KABC::Addressee& addr, AddresseeV } void -AddressesDialog::addAddresseesToSelected( AddresseeViewItem *tqparent, +AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent, const TQPtrList<AddresseeViewItem>& addresses ) { - Q_ASSERT( tqparent ); + Q_ASSERT( parent ); TQPtrListIterator<AddresseeViewItem> itr( addresses ); @@ -686,15 +686,15 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *tqparent, AddresseeViewItem* newItem = 0; if (address->category() == AddresseeViewItem::Entry) { - newItem = new AddresseeViewItem( tqparent, address->addressee() ); + newItem = new AddresseeViewItem( parent, address->addressee() ); } else if (address->category() == AddresseeViewItem::DistList) { - newItem = new AddresseeViewItem( tqparent, address->name() ); + newItem = new AddresseeViewItem( parent, address->name() ); } else { - newItem = new AddresseeViewItem( tqparent, address->name(), allAddressee( address ) ); + newItem = new AddresseeViewItem( parent, address->name(), allAddressee( address ) ); } address->setSelected( false ); @@ -705,7 +705,7 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *tqparent, this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } - tqparent->setOpen( true ); + parent->setOpen( true ); } TQStringList @@ -819,7 +819,7 @@ AddressesDialog::removeEntry() resetCC = true; else if( d->bccItem == item ) resetBCC = true; - // we may only append tqparent items + // we may only append parent items unmapSelectedAddress(item); lst.append( item ); } @@ -854,7 +854,7 @@ AddressesDialog::removeEntry() // copied from kabcore.cpp :( // KDE4: should be in libkabc I think -static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *tqparent ) +static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *parent ) { TQPtrList<KABC::Resource> kabcResources = abook->resources(); @@ -870,7 +870,7 @@ static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *tqpa } } - KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, tqparent ); + KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); return static_cast<KABC::Resource*>( res ); } #endif @@ -1002,11 +1002,11 @@ AddressesDialog::filterChanged( const TQString& txt ) if ( item->category() == AddresseeViewItem::Entry ) { bool matches = item->matches( txt ); item->setVisible( matches ); - TQListViewItem *tqparent = static_cast<TQListViewItem*>( item )->tqparent(); - if ( matches && tqparent ) { - if ( tqparent == d->personal ) { + TQListViewItem *parent = static_cast<TQListViewItem*>( item )->parent(); + if ( matches && parent ) { + if ( parent == d->personal ) { personalVisible++; - } else if ( tqparent == d->recent ) { + } else if ( parent == d->recent ) { recentVisible++; } } @@ -1087,19 +1087,19 @@ AddressesDialog::allAddressee( KListView* view, bool onlySelected ) const } KABC::Addressee::List -AddressesDialog::allAddressee( AddresseeViewItem* tqparent ) const +AddressesDialog::allAddressee( AddresseeViewItem* parent ) const { KABC::Addressee::List lst; - if ( !tqparent ) return lst; + if ( !parent ) return lst; - if ( tqparent->category() == AddresseeViewItem::Entry ) + if ( parent->category() == AddresseeViewItem::Entry ) { - lst.append( tqparent->addressee() ); + lst.append( parent->addressee() ); return lst; } - AddresseeViewItem *myChild = static_cast<AddresseeViewItem*>( tqparent->firstChild() ); + AddresseeViewItem *myChild = static_cast<AddresseeViewItem*>( parent->firstChild() ); while( myChild ) { if ( myChild->category() == AddresseeViewItem::FilledGroup ) lst += myChild->addresses(); @@ -1112,14 +1112,14 @@ AddressesDialog::allAddressee( AddresseeViewItem* tqparent ) const } TQStringList -AddressesDialog::allDistributionLists( AddresseeViewItem* tqparent ) const +AddressesDialog::allDistributionLists( AddresseeViewItem* parent ) const { TQStringList lists; - if ( !tqparent ) + if ( !parent ) return TQStringList(); - AddresseeViewItem *item = static_cast<AddresseeViewItem*>( tqparent->firstChild() ); + AddresseeViewItem *item = static_cast<AddresseeViewItem*>( parent->firstChild() ); while ( item ) { if ( item->category() == AddresseeViewItem::DistList && !item->name().isEmpty() ) lists.append( item->name() ); diff --git a/libkdepim/addressesdialog.h b/libkdepim/addressesdialog.h index 71d6925da..5b5f604dc 100644 --- a/libkdepim/addressesdialog.h +++ b/libkdepim/addressesdialog.h @@ -50,10 +50,10 @@ namespace KPIM { FilledGroup =5, DistList =6 }; - AddresseeViewItem( AddresseeViewItem *tqparent, const KABC::Addressee& addr, int emailIndex = 0 ); + AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, int emailIndex = 0 ); AddresseeViewItem( KListView *lv, const TQString& name, Category cat=Group ); - AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name, const KABC::Addressee::List &lst ); - AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name ); + AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const KABC::Addressee::List &lst ); + AddresseeViewItem( AddresseeViewItem *parent, const TQString& name ); ~AddresseeViewItem(); KABC::Addressee addressee() const; @@ -194,12 +194,12 @@ namespace KPIM { AddresseeViewItem* defaultParent=0, bool useCategory=true ); void addAddresseeToSelected( const KABC::Addressee& addr, AddresseeViewItem* defaultParent=0 ); - void addAddresseesToSelected( AddresseeViewItem *tqparent, + void addAddresseesToSelected( AddresseeViewItem *parent, const TQPtrList<AddresseeViewItem>& addresses ); TQStringList entryToString( const KABC::Addressee::List& l ) const; - KABC::Addressee::List allAddressee( AddresseeViewItem* tqparent ) const; + KABC::Addressee::List allAddressee( AddresseeViewItem* parent ) const; KABC::Addressee::List allAddressee( KListView* view, bool onlySelected = true ) const; - TQStringList allDistributionLists( AddresseeViewItem* tqparent ) const; + TQStringList allDistributionLists( AddresseeViewItem* parent ) const; private: // if there's only one group in the available list, open it diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp index c5c4885bd..4b25faab6 100644 --- a/libkdepim/categoryeditdialog.cpp +++ b/libkdepim/categoryeditdialog.cpp @@ -57,9 +57,9 @@ class CategoryListViewItem : public TQListViewItem } }; -CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* tqparent, +CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent, const char* name, bool modal ) - : KDialogBase::KDialogBase( tqparent, name, modal, + : KDialogBase::KDialogBase( parent, name, modal, i18n("Edit Categories"), Ok|Apply|Cancel|Help, Ok, true ), mPrefs( prefs ), d( new Private ) { diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h index 761dbad15..d4d4e3d47 100644 --- a/libkdepim/categoryeditdialog.h +++ b/libkdepim/categoryeditdialog.h @@ -34,7 +34,7 @@ class KDE_EXPORT CategoryEditDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - CategoryEditDialog( KPimPrefs *prefs, TQWidget* tqparent = 0, + CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent = 0, const char* name = 0, bool modal = false ); ~CategoryEditDialog(); diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp index 5b39139e4..4eb072b12 100644 --- a/libkdepim/categoryselectdialog.cpp +++ b/libkdepim/categoryselectdialog.cpp @@ -32,9 +32,9 @@ using namespace KPIM; -CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* tqparent, +CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* parent, const char* name, bool modal ) - : KDialogBase::KDialogBase( tqparent, name, modal, + : KDialogBase::KDialogBase( parent, name, modal, i18n("Select Categories"), Ok|Apply|Cancel|Help, Ok, true ), mPrefs( prefs ) { diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h index 9c3044443..b9d880665 100644 --- a/libkdepim/categoryselectdialog.h +++ b/libkdepim/categoryselectdialog.h @@ -35,7 +35,7 @@ class KDE_EXPORT CategorySelectDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - CategorySelectDialog( KPimPrefs *prefs, TQWidget *tqparent = 0, + CategorySelectDialog( KPimPrefs *prefs, TQWidget *parent = 0, const char *name = 0, bool modal = false ); ~CategorySelectDialog(); diff --git a/libkdepim/clicklineedit.cpp b/libkdepim/clicklineedit.cpp index f8bfe0e91..98748e44a 100644 --- a/libkdepim/clicklineedit.cpp +++ b/libkdepim/clicklineedit.cpp @@ -26,8 +26,8 @@ using namespace KPIM; -ClickLineEdit::ClickLineEdit(TQWidget *tqparent, const TQString &msg, const char* name) : - KLineEdit(tqparent, name) +ClickLineEdit::ClickLineEdit(TQWidget *parent, const TQString &msg, const char* name) : + KLineEdit(parent, name) { mDrawClickMsg = true; setClickMessage( msg ); diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h index f9a9543d0..a0df8410d 100644 --- a/libkdepim/clicklineedit.h +++ b/libkdepim/clicklineedit.h @@ -39,7 +39,7 @@ class KDE_EXPORT ClickLineEdit : public KLineEdit TQ_OBJECT TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage ) public: - ClickLineEdit( TQWidget *tqparent, const TQString &msg = TQString(), const char* name = 0 ); + ClickLineEdit( TQWidget *parent, const TQString &msg = TQString(), const char* name = 0 ); ~ClickLineEdit(); void setClickMessage( const TQString &msg ); diff --git a/libkdepim/collectingprocess.cpp b/libkdepim/collectingprocess.cpp index d49da43b8..2bd0be8f6 100644 --- a/libkdepim/collectingprocess.cpp +++ b/libkdepim/collectingprocess.cpp @@ -49,8 +49,8 @@ struct CollectingProcess::Private { }; -CollectingProcess::CollectingProcess( TQObject * tqparent, const char * name ) - : KProcess( tqparent, name ) +CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) + : KProcess( parent, name ) { d = new Private(); } diff --git a/libkdepim/collectingprocess.h b/libkdepim/collectingprocess.h index 8bc4651be..1f27bd9ac 100644 --- a/libkdepim/collectingprocess.h +++ b/libkdepim/collectingprocess.h @@ -50,7 +50,7 @@ class KDE_EXPORT CollectingProcess : public KProcess { Q_OBJECT TQ_OBJECT public: - CollectingProcess( TQObject * tqparent = 0, const char * name = 0 ); + CollectingProcess( TQObject * parent = 0, const char * name = 0 ); ~CollectingProcess(); /** Starts the process in NotifyOnExit mode and writes in to stdin of diff --git a/libkdepim/completionordereditor.cpp b/libkdepim/completionordereditor.cpp index c0454ca39..2687188d0 100644 --- a/libkdepim/completionordereditor.cpp +++ b/libkdepim/completionordereditor.cpp @@ -173,8 +173,8 @@ private: }; CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, - TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n("Edit Completion Order"), Ok|Cancel, Ok, true ), + TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n("Edit Completion Order"), Ok|Cancel, Ok, true ), mConfig( "kpimcompletionorder" ), mDirty( false ) { mItems.setAutoDelete( true ); diff --git a/libkdepim/completionordereditor.h b/libkdepim/completionordereditor.h index 7d4d3e47a..50cc3b3cb 100644 --- a/libkdepim/completionordereditor.h +++ b/libkdepim/completionordereditor.h @@ -66,7 +66,7 @@ class CompletionOrderEditor : public KDialogBase { TQ_OBJECT public: - CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* tqparent, const char* name = 0 ); + CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* parent, const char* name = 0 ); ~CompletionOrderEditor(); KConfig* configFile() { return &mConfig; } diff --git a/libkdepim/configmanager.cpp b/libkdepim/configmanager.cpp index 47bcb9d0d..64b4562fc 100644 --- a/libkdepim/configmanager.cpp +++ b/libkdepim/configmanager.cpp @@ -21,8 +21,8 @@ using namespace KPIM; -ConfigManager::ConfigManager( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +ConfigManager::ConfigManager( TQObject * parent, const char * name ) + : TQObject( parent, name ) { } diff --git a/libkdepim/configmanager.h b/libkdepim/configmanager.h index ba024093e..b2612639f 100644 --- a/libkdepim/configmanager.h +++ b/libkdepim/configmanager.h @@ -46,7 +46,7 @@ signals: void changed(); protected: - ConfigManager( TQObject * tqparent=0, const char * name=0 ); + ConfigManager( TQObject * parent=0, const char * name=0 ); virtual ~ConfigManager(); }; diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp index e1f767998..100b00a25 100644 --- a/libkdepim/designerfields.cpp +++ b/libkdepim/designerfields.cpp @@ -41,9 +41,9 @@ using namespace KPIM; -DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *tqparent, +DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { initGUI( uiFile ); } diff --git a/libkdepim/designerfields.h b/libkdepim/designerfields.h index 89032eadd..cc72647fb 100644 --- a/libkdepim/designerfields.h +++ b/libkdepim/designerfields.h @@ -37,7 +37,7 @@ class KDE_EXPORT DesignerFields : public TQWidget Q_OBJECT TQ_OBJECT public: - DesignerFields( const TQString &uiFile, TQWidget *tqparent, + DesignerFields( const TQString &uiFile, TQWidget *parent, const char *name = 0 ); class Storage diff --git a/libkdepim/embeddedurlpage.cpp b/libkdepim/embeddedurlpage.cpp index d45d532d3..c840e3a04 100644 --- a/libkdepim/embeddedurlpage.cpp +++ b/libkdepim/embeddedurlpage.cpp @@ -33,8 +33,8 @@ using namespace KPIM; EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype, - TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), mUri(url), mMimeType( mimetype ), mPart( 0 ) + TQWidget *parent, const char *name ) + : TQWidget( parent, name ), mUri(url), mMimeType( mimetype ), mPart( 0 ) { initGUI( url, mimetype ); } @@ -54,7 +54,7 @@ void EmbeddedURLPage::loadContents() TQString mimetype = mMimeType; if ( mimetype == "auto" ) mimetype == KMimeType::findByURL( mUri )->name(); - // "this" is both the tqparent widget and the tqparent object + // "this" is both the parent widget and the parent object mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 ); if ( mPart ) { mPart->openURL( mUri ); diff --git a/libkdepim/embeddedurlpage.h b/libkdepim/embeddedurlpage.h index 7f5c4c9e2..dcae4fb59 100644 --- a/libkdepim/embeddedurlpage.h +++ b/libkdepim/embeddedurlpage.h @@ -35,7 +35,7 @@ class KDE_EXPORT EmbeddedURLPage : public TQWidget TQ_OBJECT public: EmbeddedURLPage( const TQString &url, const TQString &mimetype, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); public slots: void loadContents(); diff --git a/libkdepim/htmldiffalgodisplay.cpp b/libkdepim/htmldiffalgodisplay.cpp index 124f23874..41fe99a3f 100644 --- a/libkdepim/htmldiffalgodisplay.cpp +++ b/libkdepim/htmldiffalgodisplay.cpp @@ -30,8 +30,8 @@ static TQString textToHTML( const TQString &text ) return TQStyleSheet::convertFromPlainText( text ); } -HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *tqparent ) - : KTextBrowser( tqparent ) +HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent ) + : KTextBrowser( parent ) { setWrapPolicy( TQTextEdit::AtWordBoundary ); setVScrollBarMode( TQScrollView::AlwaysOff ); diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h index 55090f41c..4495e2003 100644 --- a/libkdepim/htmldiffalgodisplay.h +++ b/libkdepim/htmldiffalgodisplay.h @@ -32,7 +32,7 @@ namespace KPIM { class KDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser { public: - HTMLDiffAlgoDisplay( TQWidget *tqparent ); + HTMLDiffAlgoDisplay( TQWidget *parent ); void begin(); void end(); diff --git a/libkdepim/infoextension.cpp b/libkdepim/infoextension.cpp index 3c8ac26f9..55cb35683 100644 --- a/libkdepim/infoextension.cpp +++ b/libkdepim/infoextension.cpp @@ -26,8 +26,8 @@ using namespace KParts; -InfoExtension::InfoExtension( KParts::ReadOnlyPart *tqparent, const char* name) -: TQObject(tqparent, name), d(0) +InfoExtension::InfoExtension( KParts::ReadOnlyPart *parent, const char* name) +: TQObject(parent, name), d(0) { } diff --git a/libkdepim/infoextension.h b/libkdepim/infoextension.h index 343f71720..392178f5a 100644 --- a/libkdepim/infoextension.h +++ b/libkdepim/infoextension.h @@ -44,10 +44,10 @@ namespace KParts /** * Constucts an InfoExtension. * - * @param tqparent The tqparent widget. + * @param parent The parent widget. * @param name The name of the class. **/ - InfoExtension( KParts::ReadOnlyPart *tqparent, const char* name); + InfoExtension( KParts::ReadOnlyPart *parent, const char* name); ~InfoExtension(); private: diff --git a/libkdepim/kaddrbook.cpp b/libkdepim/kaddrbook.cpp index 3a0c7dc02..1036a263b 100644 --- a/libkdepim/kaddrbook.cpp +++ b/libkdepim/kaddrbook.cpp @@ -32,7 +32,7 @@ #include <unistd.h> //----------------------------------------------------------------------------- -void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *tqparent ) { +void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { TQString email; TQString name; @@ -78,12 +78,12 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *tqparent ) { #else TQString text = email + " " + i18n( "is not in address book" ); #endif - KMessageBox::information( tqparent, text, TQString(), "notInAddressBook" ); + KMessageBox::information( parent, text, TQString(), "notInAddressBook" ); } } //----------------------------------------------------------------------------- -void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *tqparent) { +void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { TQString email; TQString name; @@ -91,7 +91,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *tqparent) { KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); - ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) ); + ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) ); // force a reload of the address book file so that changes that were made // by other programs are loaded @@ -151,12 +151,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *tqparent) { TQString text = i18n("<qt>The email address <b>%1</b> was added to your " "addressbook; you can add more information to this " "entry by opening the addressbook.</qt>").tqarg( addr ); - KMessageBox::information( tqparent, text, TQString(), "addedtokabc" ); + KMessageBox::information( parent, text, TQString(), "addedtokabc" ); } } else { TQString text = i18n("<qt>The email address <b>%1</b> is already in your " "addressbook.</qt>").tqarg( addr ); - KMessageBox::information( tqparent, text, TQString(), + KMessageBox::information( parent, text, TQString(), "alreadyInAddressBook" ); } ab->setErrorHandler( 0 ); @@ -173,12 +173,12 @@ void KAddrBookExternal::addNewAddressee( TQWidget* ) call.send("newContact()"); } -bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *tqparent ) +bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *parent ) { KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); bool inserted = false; - ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) ); + ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) ); KABC::Addressee::List addressees = ab->findByEmail( addressee.preferredEmail() ); @@ -188,7 +188,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *tq TQString text = i18n("The VCard was added to your addressbook; " "you can add more information to this " "entry by opening the addressbook."); - KMessageBox::information( tqparent, text, TQString(), "addedtokabc" ); + KMessageBox::information( parent, text, TQString(), "addedtokabc" ); inserted = true; } } else { @@ -196,7 +196,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *tq "your addressbook; however, you may save the VCard " "into a file and import it into the addressbook " "manually."); - KMessageBox::information( tqparent, text ); + KMessageBox::information( parent, text ); inserted = true; } diff --git a/libkdepim/kaddrbook.h b/libkdepim/kaddrbook.h index b48352346..374753e54 100644 --- a/libkdepim/kaddrbook.h +++ b/libkdepim/kaddrbook.h @@ -19,12 +19,12 @@ class TQWidget; class KDE_EXPORT KAddrBookExternal { public: - static void addEmail( const TQString &addr, TQWidget *tqparent ); + static void addEmail( const TQString &addr, TQWidget *parent ); static void addNewAddressee( TQWidget* ); - static void openEmail( const TQString &addr, TQWidget *tqparent ); - static void openAddressBook( TQWidget *tqparent ); + static void openEmail( const TQString &addr, TQWidget *parent ); + static void openAddressBook( TQWidget *parent ); - static bool addVCard( const KABC::Addressee& addressee, TQWidget *tqparent ); + static bool addVCard( const KABC::Addressee& addressee, TQWidget *parent ); static TQString expandDistributionList( const TQString& listName ); diff --git a/libkdepim/kcmdesignerfields.cpp b/libkdepim/kcmdesignerfields.cpp index bc7ddb747..dbe2faca2 100644 --- a/libkdepim/kcmdesignerfields.cpp +++ b/libkdepim/kcmdesignerfields.cpp @@ -56,8 +56,8 @@ using namespace KPIM; class PageItem : public TQCheckListItem { public: - PageItem( TQListView *tqparent, const TQString &path ) - : TQCheckListItem( tqparent, "", TQCheckListItem::CheckBox ), + PageItem( TQListView *parent, const TQString &path ) + : TQCheckListItem( parent, "", TQCheckListItem::CheckBox ), mPath( path ), mIsActive( false ) { mName = path.mid( path.findRev( '/' ) + 1 ); @@ -126,8 +126,8 @@ class PageItem : public TQCheckListItem bool mIsActive; }; -KCMDesignerFields::KCMDesignerFields( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) ); @@ -174,7 +174,7 @@ void KCMDesignerFields::deleteFile() { TQListViewItem *item = mPageView->selectedItem(); if ( item ) { - PageItem *pageItem = static_cast<PageItem*>( item->tqparent() ? item->tqparent() : item ); + PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item ); if (KMessageBox::warningContinueCancel(this, i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").tqarg( pageItem->text(0) ), "", KStdGuiItem::del() ) == KMessageBox::Continue) @@ -215,7 +215,7 @@ void KCMDesignerFields::loadActivePages(const TQStringList& ai) { TQListViewItemIterator it( mPageView ); while ( it.current() ) { - if ( it.current()->tqparent() == 0 ) { + if ( it.current()->parent() == 0 ) { PageItem *item = static_cast<PageItem*>( it.current() ); if ( ai.find( item->name() ) != ai.end() ) { item->setOn( true ); @@ -239,7 +239,7 @@ TQStringList KCMDesignerFields::saveActivePages() TQStringList activePages; while ( it.current() ) { - if ( it.current()->tqparent() == 0 ) { + if ( it.current()->parent() == 0 ) { PageItem *item = static_cast<PageItem*>( it.current() ); activePages.append( item->name() ); } @@ -353,7 +353,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) bool widgetItemSelected = false; if ( item ) { - if ( item->tqparent() ) { + if ( item->parent() ) { TQString details = TQString( "<qt><table>" "<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>" "<tr><td align=\"right\"><b>%3</b></td><td>%4</td></tr>" @@ -371,7 +371,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) mPageDetails->setText( details ); - PageItem *pageItem = static_cast<PageItem*>( item->tqparent() ); + PageItem *pageItem = static_cast<PageItem*>( item->parent() ); mPagePreview->setPixmap( pageItem->preview() ); } else { mPageDetails->setText( TQString() ); @@ -394,7 +394,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) void KCMDesignerFields::itemClicked( TQListViewItem *item ) { - if ( !item || item->tqparent() != 0 ) + if ( !item || item->parent() != 0 ) return; PageItem *pageItem = static_cast<PageItem*>( item ); @@ -420,7 +420,7 @@ void KCMDesignerFields::startDesigner() TQListViewItem *item = mPageView->selectedItem(); if ( item ) { - PageItem *pageItem = static_cast<PageItem*>( item->tqparent() ? item->tqparent() : item ); + PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item ); cmdLine += " " + KProcess::quote( pageItem->path() ); } diff --git a/libkdepim/kcmdesignerfields.h b/libkdepim/kcmdesignerfields.h index e2e5d5a56..e978f9546 100644 --- a/libkdepim/kcmdesignerfields.h +++ b/libkdepim/kcmdesignerfields.h @@ -39,7 +39,7 @@ class KDE_EXPORT KCMDesignerFields : public KCModule TQ_OBJECT public: - KCMDesignerFields( TQWidget *tqparent = 0, const char *name = 0 ); + KCMDesignerFields( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/libkdepim/kconfigwizard.cpp b/libkdepim/kconfigwizard.cpp index 99aa0b598..6db0f9992 100644 --- a/libkdepim/kconfigwizard.cpp +++ b/libkdepim/kconfigwizard.cpp @@ -31,18 +31,18 @@ #include <tqlayout.h> #include <tqtimer.h> -KConfigWizard::KConfigWizard( TQWidget *tqparent, +KConfigWizard::KConfigWizard( TQWidget *parent, char *name, bool modal ) - : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, tqparent, + : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent, name, modal ), mPropagator( 0 ), mChangesPage( 0 ) { init(); } -KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *tqparent, +KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *parent, char *name, bool modal ) - : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, tqparent, + : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent, name, modal ), mPropagator( propagator ), mChangesPage( 0 ) { diff --git a/libkdepim/kconfigwizard.h b/libkdepim/kconfigwizard.h index 290b55e3e..31cb63ed8 100644 --- a/libkdepim/kconfigwizard.h +++ b/libkdepim/kconfigwizard.h @@ -38,12 +38,12 @@ class KDE_EXPORT KConfigWizard : public KDialogBase /** Create wizard. You have to set a propgator with setPropagator() later. */ - KConfigWizard( TQWidget *tqparent = 0, char *name = 0, bool modal = false ); + KConfigWizard( TQWidget *parent = 0, char *name = 0, bool modal = false ); /** Create wizard for given KConfigPropagator. The wizard takes ownership of the propagator. */ - KConfigWizard( KConfigPropagator *propagator, TQWidget *tqparent = 0, + KConfigWizard( KConfigPropagator *propagator, TQWidget *parent = 0, char *name = 0, bool modal = false ); /** Destructor. diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp index 65dc3b8b3..e7989c7af 100644 --- a/libkdepim/kdateedit.cpp +++ b/libkdepim/kdateedit.cpp @@ -37,8 +37,8 @@ class DateValidator : public TQValidator { public: - DateValidator( const TQStringList &keywords, TQWidget* tqparent, const char* name = 0 ) - : TQValidator( TQT_TQOBJECT(tqparent), name ), mKeywords( keywords ) + DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 ) + : TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords ) {} virtual State validate( TQString &str, int& ) const @@ -64,8 +64,8 @@ class DateValidator : public TQValidator TQStringList mKeywords; }; -KDateEdit::KDateEdit( TQWidget *tqparent, const char *name ) - : TQComboBox( true, tqparent, name ), +KDateEdit::KDateEdit( TQWidget *parent, const char *name ) + : TQComboBox( true, parent, name ), mReadOnly( false ), mDiscardNextMousePress( false ) { diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h index cde85b0f9..500fc0296 100644 --- a/libkdepim/kdateedit.h +++ b/libkdepim/kdateedit.h @@ -57,7 +57,7 @@ class KDE_EXPORT KDateEdit : public TQComboBox TQ_OBJECT public: - KDateEdit( TQWidget *tqparent = 0, const char *name = 0 ); + KDateEdit( TQWidget *parent = 0, const char *name = 0 ); virtual ~KDateEdit(); /** diff --git a/libkdepim/kdatepickerpopup.cpp b/libkdepim/kdatepickerpopup.cpp index 7d1f64272..8e3f36953 100644 --- a/libkdepim/kdatepickerpopup.cpp +++ b/libkdepim/kdatepickerpopup.cpp @@ -26,9 +26,9 @@ #include "kdatepickerpopup.h" -KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *tqparent, +KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *parent, const char *name ) - : TQPopupMenu( tqparent, name ) + : TQPopupMenu( parent, name ) { mItems = items; diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h index 4b5632804..98138dfed 100644 --- a/libkdepim/kdatepickerpopup.h +++ b/libkdepim/kdatepickerpopup.h @@ -54,11 +54,11 @@ class KDE_EXPORT KDatePickerPopup: public TQPopupMenu @param items List of all desirable items, separated with a bitwise OR. @param date Initial date of datepicker-widget. - @param tqparent The object's tqparent. + @param parent The object's parent. @param name The object's name. */ KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(), - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); /** @return A pointer to the private variable mDatePicker, an instance of diff --git a/libkdepim/kfileio.cpp b/libkdepim/kfileio.cpp index 01188f004..8addb772a 100644 --- a/libkdepim/kfileio.cpp +++ b/libkdepim/kfileio.cpp @@ -365,7 +365,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, return error; } -bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent, +bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent, const TQString &toCheck, const bool recursive, const bool wantItReadable, const bool wantItWritable ) { @@ -376,7 +376,7 @@ bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent, // it is just a warning. if ( !error.isEmpty() ) { kdDebug() << "checkPermissions found:" << error << endl; - KMessageBox::detailedSorry(tqparent, + KMessageBox::detailedSorry(parent, i18n("Some files or folders do not have " "the right permissions, please correct them " "manually."), diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h index 928175b6f..915528888 100644 --- a/libkdepim/kfileio.h +++ b/libkdepim/kfileio.h @@ -78,10 +78,10 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, * all files and folders below. If the permissions are not ok, it tries to correct * them. If that fails then a warning with detailled information is given. * - * @param tqparent If tqparent is 0, then the message box becomes an - * application-global modal dialog box. If tqparent + * @param parent If parent is 0, then the message box becomes an + * application-global modal dialog box. If parent * is a widget, the message box becomes modal - * relative to tqparent. + * relative to parent. * @param toCheck The file or folder of which the permissions should * be checked. * @param recursive Set to true, it will check the contents of a folder @@ -97,7 +97,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, * then the permissions are not ok and it was not possible to correct * all errors. */ -bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent, +bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent, const TQString &toCheck, const bool recursive, const bool wantItReadable, const bool wantItWritable ); } diff --git a/libkdepim/kfoldertree.cpp b/libkdepim/kfoldertree.cpp index 69111d559..64859199a 100644 --- a/libkdepim/kfoldertree.cpp +++ b/libkdepim/kfoldertree.cpp @@ -12,18 +12,18 @@ #include <tqstyle.h> //----------------------------------------------------------------------------- -KFolderTreeItem::KFolderTreeItem( KFolderTree *tqparent, const TQString & label, +KFolderTreeItem::KFolderTreeItem( KFolderTree *parent, const TQString & label, Protocol protocol, Type type ) - : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ), + : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ), mUnread(-1), mTotal(0), mSize(0), mFolderIsCloseToQuota( false ) { } //----------------------------------------------------------------------------- -KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *tqparent, +KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *parent, const TQString & label, Protocol protocol, Type type, int unread, int total ) - : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ), + : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ), mUnread( unread ), mTotal( total ), mSize(0), mFolderIsCloseToQuota( false ) { } @@ -359,8 +359,8 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v ) //============================================================================= -KFolderTree::KFolderTree( TQWidget *tqparent, const char* name ) - : KListView( tqparent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1) +KFolderTree::KFolderTree( TQWidget *parent, const char* name ) + : KListView( parent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1) { // GUI-options setStyleDependantFrameWidth(); diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h index 9206b8c5e..eb297b739 100644 --- a/libkdepim/kfoldertree.h +++ b/libkdepim/kfoldertree.h @@ -171,11 +171,11 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem }; /** constructs a root-item */ - KFolderTreeItem( KFolderTree *tqparent, const TQString & label=TQString(), + KFolderTreeItem( KFolderTree *parent, const TQString & label=TQString(), Protocol protocol=NONE, Type type=Root ); /** constructs a child-item */ - KFolderTreeItem( KFolderTreeItem *tqparent, const TQString & label=TQString(), + KFolderTreeItem( KFolderTreeItem *parent, const TQString & label=TQString(), Protocol protocol=NONE, Type type=Other, int unread=0, int total=0 ); /** compare */ @@ -245,7 +245,7 @@ class KDE_EXPORT KFolderTree : public KListView TQ_OBJECT public: - KFolderTree( TQWidget *tqparent, const char *name=0 ); + KFolderTree( TQWidget *parent, const char *name=0 ); /** registers MIMETypes that are handled @param mimeType the name of the MIMEType diff --git a/libkdepim/kimportdialog.cpp b/libkdepim/kimportdialog.cpp index 0e08eec29..64b49c4db 100644 --- a/libkdepim/kimportdialog.cpp +++ b/libkdepim/kimportdialog.cpp @@ -130,7 +130,7 @@ TQString KImportColumn::convert() class ColumnItem : public TQListViewItem { public: - ColumnItem(KImportColumn *col,TQListView *tqparent) : TQListViewItem(tqparent), mColumn(col) + ColumnItem(KImportColumn *col,TQListView *parent) : TQListViewItem(parent), mColumn(col) { setText(0,mColumn->header()); } @@ -148,8 +148,8 @@ class ColumnItem : public TQListViewItem { data objects, this class has to be inherited by a special class, which reimplements the convertRow() function. */ -KImportDialog::KImportDialog(TQWidget* tqparent) - : KDialogBase(tqparent,"importdialog",true,i18n("Import Text File"),Ok|Cancel), +KImportDialog::KImportDialog(TQWidget* parent) + : KDialogBase(parent,"importdialog",true,i18n("Import Text File"),Ok|Cancel), mSeparator(","), mCurrentRow(0) { diff --git a/libkdepim/kimportdialog.h b/libkdepim/kimportdialog.h index b16f335f6..59185825d 100644 --- a/libkdepim/kimportdialog.h +++ b/libkdepim/kimportdialog.h @@ -78,7 +78,7 @@ class KImportDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KImportDialog(TQWidget* tqparent); + KImportDialog(TQWidget* parent); public slots: bool setFile(const TQString& file); diff --git a/libkdepim/kincidencechooser.cpp b/libkdepim/kincidencechooser.cpp index 9e837167c..082e43590 100644 --- a/libkdepim/kincidencechooser.cpp +++ b/libkdepim/kincidencechooser.cpp @@ -44,8 +44,8 @@ int KIncidenceChooser::chooseMode = KIncidenceChooser::ask ; -KIncidenceChooser::KIncidenceChooser(TQWidget *tqparent, char *name) : - KDialog(tqparent,name,true) +KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : + KDialog(parent,name,true) { KDialog *topFrame = this; TQGridLayout *topLayout = new TQGridLayout(topFrame,5,3); diff --git a/libkdepim/kincidencechooser.h b/libkdepim/kincidencechooser.h index 4dc6b2ef1..95fb25487 100644 --- a/libkdepim/kincidencechooser.h +++ b/libkdepim/kincidencechooser.h @@ -48,7 +48,7 @@ class KDE_EXPORT KIncidenceChooser : public KDialog local, remote, newest, ask, both }; /** Initialize dialog and pages */ - KIncidenceChooser( TQWidget *tqparent=0, char *name=0 ); + KIncidenceChooser( TQWidget *parent=0, char *name=0 ); ~KIncidenceChooser(); //void setChooseText( TQString ); void setIncidence( KCal::Incidence *, KCal::Incidence * ); diff --git a/libkdepim/komposer/core/core.cpp b/libkdepim/komposer/core/core.cpp index 3618b88ee..f93e59cc9 100644 --- a/libkdepim/komposer/core/core.cpp +++ b/libkdepim/komposer/core/core.cpp @@ -53,9 +53,9 @@ using namespace Komposer; -Core::Core( TQWidget *tqparent, const char *name ) +Core::Core( TQWidget *parent, const char *name ) : KomposerIface( "KomposerIface" ), - KMainWindow( tqparent, name ), m_currentEditor( 0 ) + KMainWindow( parent, name ), m_currentEditor( 0 ) { initWidgets(); initCore(); diff --git a/libkdepim/komposer/core/corewidget.cpp b/libkdepim/komposer/core/corewidget.cpp index 53e8abd2c..c65893766 100644 --- a/libkdepim/komposer/core/corewidget.cpp +++ b/libkdepim/komposer/core/corewidget.cpp @@ -24,8 +24,8 @@ using namespace Komposer; -CoreWidget::CoreWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +CoreWidget::CoreWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { } diff --git a/libkdepim/komposer/core/corewidget.h b/libkdepim/komposer/core/corewidget.h index 8c67e77d0..7d2acc6db 100644 --- a/libkdepim/komposer/core/corewidget.h +++ b/libkdepim/komposer/core/corewidget.h @@ -34,7 +34,7 @@ namespace Komposer Q_OBJECT TQ_OBJECT public: - CoreWidget( TQWidget *tqparent, const char *name=0 ); + CoreWidget( TQWidget *parent, const char *name=0 ); virtual TQString subject() const =0; virtual TQStringList to() const =0; diff --git a/libkdepim/komposer/core/editor.cpp b/libkdepim/komposer/core/editor.cpp index d9ecbd56e..5dada393f 100644 --- a/libkdepim/komposer/core/editor.cpp +++ b/libkdepim/komposer/core/editor.cpp @@ -30,8 +30,8 @@ public: TQString id; }; -Editor::Editor( TQObject *tqparent, const char *name, const TQStringList &args ) - : Plugin( tqparent, name, args ), d( new Private ) +Editor::Editor( TQObject *parent, const char *name, const TQStringList &args ) + : Plugin( parent, name, args ), d( new Private ) { } diff --git a/libkdepim/komposer/core/editor.h b/libkdepim/komposer/core/editor.h index 9cc9336dd..cdc05710d 100644 --- a/libkdepim/komposer/core/editor.h +++ b/libkdepim/komposer/core/editor.h @@ -93,7 +93,7 @@ namespace Komposer { virtual void changeSignature( const TQString &txt ) =0; protected: - Editor( TQObject *tqparent, const char *name, const TQStringList &args ); + Editor( TQObject *parent, const char *name, const TQStringList &args ); private: class Private; diff --git a/libkdepim/komposer/core/plugin.cpp b/libkdepim/komposer/core/plugin.cpp index dbadaff59..41af47cd9 100644 --- a/libkdepim/komposer/core/plugin.cpp +++ b/libkdepim/komposer/core/plugin.cpp @@ -35,8 +35,8 @@ public: //Core* core; }; -Plugin::Plugin( TQObject *tqparent, const char *name, const TQStringList & ) - : TQObject( tqparent, name ), d( new Private ) +Plugin::Plugin( TQObject *parent, const char *name, const TQStringList & ) + : TQObject( parent, name ), d( new Private ) { //d->core = core; } diff --git a/libkdepim/komposer/core/plugin.h b/libkdepim/komposer/core/plugin.h index bb62f3224..7acd7f70f 100644 --- a/libkdepim/komposer/core/plugin.h +++ b/libkdepim/komposer/core/plugin.h @@ -64,7 +64,7 @@ namespace Komposer Core *core() const; protected: friend class PluginManager; - Plugin( TQObject *tqparent, const char *name, const TQStringList& args = TQStringList() ); + Plugin( TQObject *parent, const char *name, const TQStringList& args = TQStringList() ); private: class Private; diff --git a/libkdepim/komposer/core/pluginmanager.cpp b/libkdepim/komposer/core/pluginmanager.cpp index 30d52ffcd..dcfea6f4b 100644 --- a/libkdepim/komposer/core/pluginmanager.cpp +++ b/libkdepim/komposer/core/pluginmanager.cpp @@ -66,8 +66,8 @@ public: TQValueStack<TQString> pluginsToLoad; }; -PluginManager::PluginManager( TQObject *tqparent ) - : TQObject( tqparent ) +PluginManager::PluginManager( TQObject *parent ) + : TQObject( parent ) { d = new Private; diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp index 3b82f96d3..af9df085b 100644 --- a/libkdepim/komposer/core/prefsmodule.cpp +++ b/libkdepim/komposer/core/prefsmodule.cpp @@ -35,14 +35,14 @@ extern "C" { - KDE_EXPORT KCModule *create_komposerconfig( TQWidget *tqparent, const char * ) { - return new Komposer::PrefsModule( tqparent, "komposerprefs" ); + KDE_EXPORT KCModule *create_komposerconfig( TQWidget *parent, const char * ) { + return new Komposer::PrefsModule( parent, "komposerprefs" ); } } using namespace Komposer; -PrefsModule::PrefsModule( TQWidget *tqparent, const char *name ) - : KPrefsModule( Komposer::Prefs::self(), tqparent, name ) +PrefsModule::PrefsModule( TQWidget *parent, const char *name ) + : KPrefsModule( Komposer::Prefs::self(), parent, name ) { TQVBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -71,10 +71,10 @@ PrefsModule::aboutData() const EditorSelection::EditorSelection( const TQString &text, TQString &reference, - TQWidget *tqparent ) + TQWidget *parent ) : m_reference( reference ) { - m_box = new TQGroupBox( 0, TQt::Vertical, text, tqparent ); + m_box = new TQGroupBox( 0, TQt::Vertical, text, parent ); TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() ); boxLayout->tqsetAlignment( TQt::AlignTop ); diff --git a/libkdepim/komposer/core/prefsmodule.h b/libkdepim/komposer/core/prefsmodule.h index ab1744044..aba969f16 100644 --- a/libkdepim/komposer/core/prefsmodule.h +++ b/libkdepim/komposer/core/prefsmodule.h @@ -37,7 +37,7 @@ namespace Komposer { Q_OBJECT TQ_OBJECT public: - PrefsModule( TQWidget *tqparent=0, const char *name=0 ); + PrefsModule( TQWidget *parent=0, const char *name=0 ); virtual const KAboutData *aboutData() const; }; @@ -47,7 +47,7 @@ namespace Komposer { TQ_OBJECT public: - EditorSelection( const TQString &text, TQString &reference, TQWidget *tqparent ); + EditorSelection( const TQString &text, TQString &reference, TQWidget *parent ); ~EditorSelection(); void readConfig(); diff --git a/libkdepim/komposer/core/tests/managertest.cpp b/libkdepim/komposer/core/tests/managertest.cpp index 4224a2e24..487a84c59 100644 --- a/libkdepim/komposer/core/tests/managertest.cpp +++ b/libkdepim/komposer/core/tests/managertest.cpp @@ -23,8 +23,8 @@ #include "pluginmanager.h" using namespace Komposer; -ManagerTest::ManagerTest( TQObject* tqparent ) - : TQObject( tqparent ) +ManagerTest::ManagerTest( TQObject* parent ) + : TQObject( parent ) { m_manager = new PluginManager( this ); } diff --git a/libkdepim/komposer/core/tests/managertest.h b/libkdepim/komposer/core/tests/managertest.h index c0351b39f..f02510e67 100644 --- a/libkdepim/komposer/core/tests/managertest.h +++ b/libkdepim/komposer/core/tests/managertest.h @@ -34,7 +34,7 @@ class ManagerTest : public TQObject, Q_OBJECT TQ_OBJECT public: - ManagerTest( TQObject* tqparent = 0 ); + ManagerTest( TQObject* parent = 0 ); public slots: void allTests(); diff --git a/libkdepim/komposer/core/tests/tester.cpp b/libkdepim/komposer/core/tests/tester.cpp index 2a0c84618..b32c89644 100644 --- a/libkdepim/komposer/core/tests/tester.cpp +++ b/libkdepim/komposer/core/tests/tester.cpp @@ -21,8 +21,8 @@ #include "tester.h" -Tester::Tester( TQObject* tqparent ) - : TQObject( tqparent ) +Tester::Tester( TQObject* parent ) + : TQObject( parent ) { } diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp index 893b35b81..0fcba16b9 100644 --- a/libkdepim/komposer/core/tests/testmanager.cpp +++ b/libkdepim/komposer/core/tests/testmanager.cpp @@ -11,8 +11,8 @@ using namespace Komposer; -TestManager::TestManager( TQObject *tqparent ) - : TQObject( tqparent ) +TestManager::TestManager( TQObject *parent ) + : TQObject( parent ) { m_manager = new PluginManager( this ); connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)), diff --git a/libkdepim/komposer/core/tests/testmanager.h b/libkdepim/komposer/core/tests/testmanager.h index b574bc871..5dfaa15d1 100644 --- a/libkdepim/komposer/core/tests/testmanager.h +++ b/libkdepim/komposer/core/tests/testmanager.h @@ -14,7 +14,7 @@ class TestManager : public TQObject Q_OBJECT TQ_OBJECT public: - TestManager( TQObject *tqparent ); + TestManager( TQObject *parent ); public slots: void slotPluginLoaded( Plugin *plugin ); diff --git a/libkdepim/komposer/plugins/default/defaulteditor.cpp b/libkdepim/komposer/plugins/default/defaulteditor.cpp index 96458ae3d..27018ce5a 100644 --- a/libkdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libkdepim/komposer/plugins/default/defaulteditor.cpp @@ -46,8 +46,8 @@ typedef KGenericFactory<DefaultEditor> DefaultEditorFactory; K_EXPORT_COMPONENT_FACTORY( libkomposer_defaulteditor, DefaultEditorFactory( "komposer_defaulteditor" ) ) -DefaultEditor::DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args ) - : Editor( tqparent, name, args ), m_textEdit( 0 ) +DefaultEditor::DefaultEditor( TQObject *parent, const char *name, const TQStringList &args ) + : Editor( parent, name, args ), m_textEdit( 0 ) { setInstance( DefaultEditorFactory::instance() ); diff --git a/libkdepim/komposer/plugins/default/defaulteditor.h b/libkdepim/komposer/plugins/default/defaulteditor.h index 7c33bb334..84cedcbc6 100644 --- a/libkdepim/komposer/plugins/default/defaulteditor.h +++ b/libkdepim/komposer/plugins/default/defaulteditor.h @@ -36,7 +36,7 @@ class DefaultEditor : public Komposer::Editor Q_OBJECT TQ_OBJECT public: - DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args ); + DefaultEditor( TQObject *parent, const char *name, const TQStringList &args ); ~DefaultEditor(); virtual TQWidget *widget(); diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp index 16cb61bbb..afe8bad6d 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp @@ -47,7 +47,7 @@ void KPartsGenericPart::load() if ( m_part ) { delete m_part; } - // "this" is both the tqparent widget and the tqparent object + // "this" is both the parent widget and the parent object m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 ); if ( m_part ) { m_part->openURL( m_url ); @@ -63,9 +63,9 @@ TQStringList KPartsWidgetPlugin::keys() const { return TQStringList() << mykey; } -TQWidget * KPartsWidgetPlugin::create( const TQString & key, TQWidget * tqparent, const char * name ) { +TQWidget * KPartsWidgetPlugin::create( const TQString & key, TQWidget * parent, const char * name ) { if ( key == mykey ) - return new KPartsGenericPart( tqparent, name ); + return new KPartsGenericPart( parent, name ); return 0; } diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h index e87b8d019..fc49f2511 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h @@ -59,7 +59,7 @@ private: class KPartsWidgetPlugin : public TQWidgetPlugin { public: TQStringList keys() const; - TQWidget * create( const TQString & key, TQWidget * tqparent, const char * name ); + TQWidget * create( const TQString & key, TQWidget * parent, const char * name ); TQString group( const TQString & key ) const; //TQIconSet iconSet( const TQString & key ) const; TQString includeFile( const TQString & key ) const; diff --git a/libkdepim/kpimurlrequesterdlg.cpp b/libkdepim/kpimurlrequesterdlg.cpp index 7815aee55..553ca659f 100644 --- a/libkdepim/kpimurlrequesterdlg.cpp +++ b/libkdepim/kpimurlrequesterdlg.cpp @@ -25,9 +25,9 @@ // KDE3.4 or KDE4.0: FIXME: Move to kdelibs! KURL KPimURLRequesterDlg::getURL( const TQString& dir, const TQString &label, - TQWidget *tqparent, const TQString& caption ) + TQWidget *parent, const TQString& caption ) { - KURLRequesterDlg dlg(dir, label, tqparent, "filedialog", true); + KURLRequesterDlg dlg(dir, label, parent, "filedialog", true); dlg.setCaption(caption.isNull() ? i18n("Open") : caption); diff --git a/libkdepim/kpimurlrequesterdlg.h b/libkdepim/kpimurlrequesterdlg.h index ef4cc987f..ccbccc88b 100644 --- a/libkdepim/kpimurlrequesterdlg.h +++ b/libkdepim/kpimurlrequesterdlg.h @@ -35,11 +35,11 @@ class KDE_EXPORT KPimURLRequesterDlg * * @param url This specifies the initial path of the input line. * @param text The text to be shown on the label. - * @param tqparent The widget the dialog will be centered on initially. + * @param parent The widget the dialog will be centered on initially. */ static KURL getURL( const TQString &url = TQString(), const TQString &text = TQString(), - TQWidget *tqparent = 0, + TQWidget *parent = 0, const TQString &caption = TQString() ); }; diff --git a/libkdepim/kpixmapregionselectordialog.cpp b/libkdepim/kpixmapregionselectordialog.cpp index e7645d30b..4766a4521 100644 --- a/libkdepim/kpixmapregionselectordialog.cpp +++ b/libkdepim/kpixmapregionselectordialog.cpp @@ -28,8 +28,8 @@ using namespace KPIM; -KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *tqparent, - const char *name, bool modal ) : KDialogBase(tqparent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true ) +KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *parent, + const char *name, bool modal ) : KDialogBase(parent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true ) { TQVBox *vbox=new TQVBox(this); new TQLabel(i18n("Please click and drag on the image to select the region of interest:"), vbox); @@ -44,9 +44,9 @@ KPixmapRegionSelectorDialog::~KPixmapRegionSelectorDialog() { } -TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent ) +TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent ) { - KPixmapRegionSelectorDialog dialog(tqparent); + KPixmapRegionSelectorDialog dialog(parent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); @@ -65,9 +65,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQ return rect; } -TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent ) +TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent ) { - KPixmapRegionSelectorDialog dialog(tqparent); + KPixmapRegionSelectorDialog dialog(parent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight); @@ -87,9 +87,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, in return rect; } -TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent ) +TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *parent ) { - KPixmapRegionSelectorDialog dialog(tqparent); + KPixmapRegionSelectorDialog dialog(parent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); @@ -107,9 +107,9 @@ TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQ return image; } -TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent ) +TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent ) { - KPixmapRegionSelectorDialog dialog(tqparent); + KPixmapRegionSelectorDialog dialog(parent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight); diff --git a/libkdepim/kpixmapregionselectordialog.h b/libkdepim/kpixmapregionselectordialog.h index 477148fdc..7cc08e32a 100644 --- a/libkdepim/kpixmapregionselectordialog.h +++ b/libkdepim/kpixmapregionselectordialog.h @@ -51,7 +51,7 @@ public: * later the setPixmap method of the KPixmapRegionSelectorWidget widget of * the new object. */ - KPixmapRegionSelectorDialog(TQWidget *tqparent=0L, const char *name=0L, + KPixmapRegionSelectorDialog(TQWidget *parent=0L, const char *name=0L, bool modal = false ); /** * The destructor of the dialog @@ -72,7 +72,7 @@ public: * @returns the selected rectangle, or an invalid rectangle if the user * pressed the Cancel button. */ - static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent = 0L ); + static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -82,7 +82,7 @@ public: * @returns the selected rectangle, or an invalid rectangle if the user * pressed the Cancel button. */ - static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L ); + static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -91,7 +91,7 @@ public: * @returns the selected image, or an invalid image if the user * pressed the Cancel button. */ - static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent = 0L ); + static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *parent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -101,7 +101,7 @@ public: * @returns the selected image, or an invalid image if the user * pressed the Cancel button. */ - static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L ); + static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L ); protected: KPIM::KPixmapRegionSelectorWidget *m_pixmapSelectorWidget; diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp index 46e65524a..ee4c0a20e 100644 --- a/libkdepim/kpixmapregionselectorwidget.cpp +++ b/libkdepim/kpixmapregionselectorwidget.cpp @@ -41,8 +41,8 @@ using namespace KPIM; -KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *tqparent, - const char *name) : TQWidget( tqparent, name) +KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent, + const char *name) : TQWidget( parent, name) { TQHBoxLayout * hboxLayout=new TQHBoxLayout( this ); diff --git a/libkdepim/kpixmapregionselectorwidget.h b/libkdepim/kpixmapregionselectorwidget.h index b1ad7bbd2..b06c4df95 100644 --- a/libkdepim/kpixmapregionselectorwidget.h +++ b/libkdepim/kpixmapregionselectorwidget.h @@ -53,7 +53,7 @@ public: /** * Constructor for a KPixmapRegionSelectorWidget. */ - KPixmapRegionSelectorWidget( TQWidget *tqparent = 0L, const char *name=0L); + KPixmapRegionSelectorWidget( TQWidget *parent = 0L, const char *name=0L); /** * Destructor for a KPixmapRegionSelectorWidget diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp index 38adc8fa3..ca8489110 100644 --- a/libkdepim/kprefsdialog.cpp +++ b/libkdepim/kprefsdialog.cpp @@ -50,18 +50,18 @@ namespace KPrefsWidFactory { -KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *tqparent ) +KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent ) { KConfigSkeleton::ItemBool *boolItem = dynamic_cast<KConfigSkeleton::ItemBool *>( item ); if ( boolItem ) { - return new KPrefsWidBool( boolItem, tqparent ); + return new KPrefsWidBool( boolItem, parent ); } KConfigSkeleton::ItemString *stringItem = dynamic_cast<KConfigSkeleton::ItemString *>( item ); if ( stringItem ) { - return new KPrefsWidString( stringItem, tqparent ); + return new KPrefsWidString( stringItem, parent ); } KConfigSkeleton::ItemEnum *enumItem = @@ -72,7 +72,7 @@ KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *tqparent ) kdError() << "KPrefsWidFactory::create(): Enum has no choices." << endl; return 0; } else { - KPrefsWidRadios *radios = new KPrefsWidRadios( enumItem, tqparent ); + KPrefsWidRadios *radios = new KPrefsWidRadios( enumItem, parent ); TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it; for( it = choices.begin(); it != choices.end(); ++it ) { radios->addRadio( (*it).label ); @@ -84,7 +84,7 @@ KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *tqparent ) KConfigSkeleton::ItemInt *intItem = dynamic_cast<KConfigSkeleton::ItemInt *>( item ); if ( intItem ) { - return new KPrefsWidInt( intItem, tqparent ); + return new KPrefsWidInt( intItem, parent ); } return 0; @@ -99,10 +99,10 @@ TQValueList<TQWidget *> KPrefsWid::widgets() const } -KPrefsWidBool::KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *tqparent ) +KPrefsWidBool::KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent ) : mItem( item ) { - mCheck = new TQCheckBox( item->label(), tqparent); + mCheck = new TQCheckBox( item->label(), parent); connect( mCheck, TQT_SIGNAL( clicked() ), TQT_SIGNAL( changed() ) ); if ( !item->whatsThis().isNull() ) { TQWhatsThis::add( mCheck, item->whatsThis() ); @@ -133,11 +133,11 @@ TQValueList<TQWidget *> KPrefsWidBool::widgets() const KPrefsWidInt::KPrefsWidInt( KConfigSkeleton::ItemInt *item, - TQWidget *tqparent ) + TQWidget *parent ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', tqparent ); - mSpin = new TQSpinBox( tqparent ); + mLabel = new TQLabel( mItem->label()+':', parent ); + mSpin = new TQSpinBox( parent ); if ( !item->minValue().isNull() ) { mSpin->setMinValue( item->minValue().toInt() ); } @@ -183,12 +183,12 @@ TQValueList<TQWidget *> KPrefsWidInt::widgets() const KPrefsWidColor::KPrefsWidColor( KConfigSkeleton::ItemColor *item, - TQWidget *tqparent ) + TQWidget *parent ) : mItem( item ) { - mButton = new KColorButton( tqparent ); + mButton = new KColorButton( parent ); connect( mButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SIGNAL( changed() ) ); - mLabel = new TQLabel( mButton, mItem->label()+':', tqparent ); + mLabel = new TQLabel( mButton, mItem->label()+':', parent ); mLabel->setBuddy( mButton ); TQString whatsThis = mItem->whatsThis(); if (!whatsThis.isNull()) { @@ -223,15 +223,15 @@ KColorButton *KPrefsWidColor::button() KPrefsWidFont::KPrefsWidFont( KConfigSkeleton::ItemFont *item, - TQWidget *tqparent, const TQString &sampleText ) + TQWidget *parent, const TQString &sampleText ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', tqparent ); + mLabel = new TQLabel( mItem->label()+':', parent ); - mPreview = new TQLabel( sampleText, tqparent ); + mPreview = new TQLabel( sampleText, parent ); mPreview->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - mButton = new TQPushButton( i18n("Choose..."), tqparent ); + mButton = new TQPushButton( i18n("Choose..."), parent ); connect( mButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectFont() ) ); TQString whatsThis = mItem->whatsThis(); if (!whatsThis.isNull()) { @@ -281,11 +281,11 @@ void KPrefsWidFont::selectFont() KPrefsWidTime::KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, - TQWidget *tqparent ) + TQWidget *parent ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', tqparent ); - mTimeEdit = new KTimeEdit( tqparent ); + mLabel = new TQLabel( mItem->label()+':', parent ); + mTimeEdit = new KTimeEdit( parent ); mLabel->setBuddy( mTimeEdit ); connect( mTimeEdit, TQT_SIGNAL( timeChanged( TQTime ) ), TQT_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); @@ -320,11 +320,11 @@ KTimeEdit *KPrefsWidTime::timeEdit() KPrefsWidDuration::KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, - TQWidget *tqparent ) + TQWidget *parent ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', tqparent ); - mTimeEdit = new TQTimeEdit( tqparent ); + mLabel = new TQLabel( mItem->label()+':', parent ); + mTimeEdit = new TQTimeEdit( parent ); mLabel->setBuddy( mTimeEdit ); mTimeEdit->setAutoAdvance( true ); mTimeEdit->setDisplay( TQTimeEdit::Hours | TQTimeEdit::Minutes ); @@ -361,11 +361,11 @@ TQTimeEdit *KPrefsWidDuration::timeEdit() KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, - TQWidget *tqparent ) + TQWidget *parent ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', tqparent ); - mDateEdit = new KDateEdit( tqparent ); + mLabel = new TQLabel( mItem->label()+':', parent ); + mDateEdit = new KDateEdit( parent ); mLabel->setBuddy( mDateEdit ); connect( mDateEdit, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); @@ -398,10 +398,10 @@ KDateEdit *KPrefsWidDate::dateEdit() KPrefsWidRadios::KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, - TQWidget *tqparent ) + TQWidget *parent ) : mItem( item ) { - mBox = new TQButtonGroup( 1, Qt::Horizontal, mItem->label(), tqparent ); + mBox = new TQButtonGroup( 1, Qt::Horizontal, mItem->label(), parent ); connect( mBox, TQT_SIGNAL( clicked( int ) ), TQT_SIGNAL( changed() ) ); } @@ -440,10 +440,10 @@ TQValueList<TQWidget *> KPrefsWidRadios::widgets() const } KPrefsWidCombo::KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, - TQWidget *tqparent ) + TQWidget *parent ) : mItem( item ) { - TQHBox *hbox = new TQHBox(tqparent); + TQHBox *hbox = new TQHBox(parent); new TQLabel( mItem->label(), hbox ); mCombo = new TQComboBox( hbox ); connect( mCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); @@ -476,12 +476,12 @@ TQComboBox* KPrefsWidCombo::comboBox() } KPrefsWidString::KPrefsWidString( KConfigSkeleton::ItemString *item, - TQWidget *tqparent, + TQWidget *parent, TQLineEdit::EchoMode echomode ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', tqparent ); - mEdit = new TQLineEdit( tqparent ); + mLabel = new TQLabel( mItem->label()+':', parent ); + mEdit = new TQLineEdit( parent ); mLabel->setBuddy( mEdit ); connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SIGNAL( changed() ) ); @@ -525,12 +525,12 @@ TQValueList<TQWidget *> KPrefsWidString::widgets() const } -KPrefsWidPath::KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *tqparent, +KPrefsWidPath::KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent, const TQString &filter, uint mode ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', tqparent ); - mURLRequester = new KURLRequester( tqparent ); + mLabel = new TQLabel( mItem->label()+':', parent ); + mURLRequester = new KURLRequester( parent ); mLabel->setBuddy( mURLRequester ); mURLRequester->setMode( mode ); mURLRequester->setFilter( filter ); @@ -590,49 +590,49 @@ void KPrefsWidManager::addWid( KPrefsWid *wid ) } KPrefsWidBool *KPrefsWidManager::addWidBool( KConfigSkeleton::ItemBool *item, - TQWidget *tqparent ) + TQWidget *parent ) { - KPrefsWidBool *w = new KPrefsWidBool( item, tqparent ); + KPrefsWidBool *w = new KPrefsWidBool( item, parent ); addWid( w ); return w; } KPrefsWidTime *KPrefsWidManager::addWidTime( KConfigSkeleton::ItemDateTime *item, - TQWidget *tqparent ) + TQWidget *parent ) { - KPrefsWidTime *w = new KPrefsWidTime( item, tqparent ); + KPrefsWidTime *w = new KPrefsWidTime( item, parent ); addWid( w ); return w; } KPrefsWidDuration *KPrefsWidManager::addWidDuration( KConfigSkeleton::ItemDateTime *item, - TQWidget *tqparent ) + TQWidget *parent ) { - KPrefsWidDuration *w = new KPrefsWidDuration( item, tqparent ); + KPrefsWidDuration *w = new KPrefsWidDuration( item, parent ); addWid( w ); return w; } KPrefsWidDate *KPrefsWidManager::addWidDate( KConfigSkeleton::ItemDateTime *item, - TQWidget *tqparent ) + TQWidget *parent ) { - KPrefsWidDate *w = new KPrefsWidDate( item, tqparent ); + KPrefsWidDate *w = new KPrefsWidDate( item, parent ); addWid( w ); return w; } KPrefsWidColor *KPrefsWidManager::addWidColor( KConfigSkeleton::ItemColor *item, - TQWidget *tqparent ) + TQWidget *parent ) { - KPrefsWidColor *w = new KPrefsWidColor( item, tqparent ); + KPrefsWidColor *w = new KPrefsWidColor( item, parent ); addWid( w ); return w; } KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item, - TQWidget *tqparent ) + TQWidget *parent ) { - KPrefsWidRadios *w = new KPrefsWidRadios( item, tqparent ); + KPrefsWidRadios *w = new KPrefsWidRadios( item, parent ); TQValueList<KConfigSkeleton::ItemEnum::Choice> choices; choices = item->choices(); TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it; @@ -644,9 +644,9 @@ KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item } KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item, - TQWidget* tqparent ) + TQWidget* parent ) { - KPrefsWidCombo *w = new KPrefsWidCombo( item, tqparent ); + KPrefsWidCombo *w = new KPrefsWidCombo( item, parent ); TQValueList<KConfigSkeleton::ItemEnum::Choice> choices; choices = item->choices(); TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it; @@ -658,43 +658,43 @@ KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item, } KPrefsWidString *KPrefsWidManager::addWidString( KConfigSkeleton::ItemString *item, - TQWidget *tqparent ) + TQWidget *parent ) { - KPrefsWidString *w = new KPrefsWidString( item, tqparent, + KPrefsWidString *w = new KPrefsWidString( item, parent, TQLineEdit::Normal ); addWid( w ); return w; } KPrefsWidPath *KPrefsWidManager::addWidPath( KConfigSkeleton::ItemPath *item, - TQWidget *tqparent, const TQString &filter, uint mode ) + TQWidget *parent, const TQString &filter, uint mode ) { - KPrefsWidPath *w = new KPrefsWidPath( item, tqparent, filter, mode ); + KPrefsWidPath *w = new KPrefsWidPath( item, parent, filter, mode ); addWid( w ); return w; } KPrefsWidString *KPrefsWidManager::addWidPassword( KConfigSkeleton::ItemString *item, - TQWidget *tqparent ) + TQWidget *parent ) { - KPrefsWidString *w = new KPrefsWidString( item, tqparent, TQLineEdit::Password ); + KPrefsWidString *w = new KPrefsWidString( item, parent, TQLineEdit::Password ); addWid( w ); return w; } KPrefsWidFont *KPrefsWidManager::addWidFont( KConfigSkeleton::ItemFont *item, - TQWidget *tqparent, + TQWidget *parent, const TQString &sampleText ) { - KPrefsWidFont *w = new KPrefsWidFont( item, tqparent, sampleText ); + KPrefsWidFont *w = new KPrefsWidFont( item, parent, sampleText ); addWid( w ); return w; } KPrefsWidInt *KPrefsWidManager::addWidInt( KConfigSkeleton::ItemInt *item, - TQWidget *tqparent ) + TQWidget *parent ) { - KPrefsWidInt *w = new KPrefsWidInt( item, tqparent ); + KPrefsWidInt *w = new KPrefsWidInt( item, parent ); addWid( w ); return w; } @@ -733,9 +733,9 @@ void KPrefsWidManager::writeWidConfig() } -KPrefsDialog::KPrefsDialog( KConfigSkeleton *prefs, TQWidget *tqparent, char *name, +KPrefsDialog::KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent, char *name, bool modal ) - : KDialogBase(IconList,i18n("Preferences"),Ok|Apply|Cancel|Default,Ok,tqparent, + : KDialogBase(IconList,i18n("Preferences"),Ok|Apply|Cancel|Default,Ok,parent, name,modal,true), KPrefsWidManager( prefs ) { @@ -857,9 +857,9 @@ void KPrefsDialog::slotDefault() } -KPrefsModule::KPrefsModule( KConfigSkeleton *prefs, TQWidget *tqparent, +KPrefsModule::KPrefsModule( KConfigSkeleton *prefs, TQWidget *parent, const char *name ) - : KCModule( tqparent, name ), + : KCModule( parent, name ), KPrefsWidManager( prefs ) { emit changed( false ); diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h index e94b4a44a..9aa011593 100644 --- a/libkdepim/kprefsdialog.h +++ b/libkdepim/kprefsdialog.h @@ -96,9 +96,9 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid Create a bool value control element consisting of a TQCheckbox. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ - KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *tqparent ); + KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent ); /** Return the TQCheckbox used by this control element. @@ -131,9 +131,9 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid spinbox. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ - KPrefsWidInt( KConfigSkeleton::ItemInt *item, TQWidget *tqparent ); + KPrefsWidInt( KConfigSkeleton::ItemInt *item, TQWidget *parent ); /** Return TQLabel used by this control element. @@ -171,9 +171,9 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid Create a time value control element consisting of a label and a spinbox. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ - KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent ); + KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, TQWidget *parent ); /** Return TQLabel used by this widget. @@ -209,9 +209,9 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid spinbox. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ - KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent ); + KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, TQWidget *parent ); /** Return TQLabel used by this widget. @@ -246,9 +246,9 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid Create a time value control element consisting of a label and a date box. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ - KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent ); + KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, TQWidget *parent ); /** Return TQLabel used by this widget. @@ -286,9 +286,9 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid button for opening a color dialog. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ - KPrefsWidColor( KConfigSkeleton::ItemColor *item, TQWidget *tqparent ); + KPrefsWidColor( KConfigSkeleton::ItemColor *item, TQWidget *parent ); /** Destruct color setting widget. */ @@ -329,11 +329,11 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid button for opening a font dialog. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. @param sampleText Sample text for previewing the selected font. */ KPrefsWidFont( KConfigSkeleton::ItemFont *item, - TQWidget *tqparent, const TQString &sampleText ); + TQWidget *parent, const TQString &sampleText ); /** Destruct font setting widget. */ @@ -385,9 +385,9 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid with several radio buttons. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ - KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, TQWidget *tqparent ); + KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, TQWidget *parent ); virtual ~KPrefsWidRadios(); /** @@ -433,9 +433,9 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid combo box. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ - KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, TQWidget *tqparent ); + KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, TQWidget *parent ); virtual ~KPrefsWidCombo(); void readConfig(); @@ -466,10 +466,10 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid line edit. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. @param echomode Describes how a line edit should display its contents. */ - KPrefsWidString( KConfigSkeleton::ItemString *item, TQWidget *tqparent, + KPrefsWidString( KConfigSkeleton::ItemString *item, TQWidget *parent, TQLineEdit::EchoMode echomode=TQLineEdit::Normal ); /** Destructor. @@ -513,11 +513,11 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid line edit. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. @param filter URLRequester filter @param mode Describes how a line edit should display its contents. */ - KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *tqparent, + KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent, const TQString &filter = TQString(), uint mode = KFile::File ); /** Destructor. @@ -579,94 +579,94 @@ class KDE_EXPORT KPrefsWidManager Register a @ref KPrefsWidBool object. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ KPrefsWidBool *addWidBool( KConfigSkeleton::ItemBool *item, - TQWidget *tqparent ); + TQWidget *parent ); /** Register a @ref KPrefsWidInt object. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ KPrefsWidInt *addWidInt( KConfigSkeleton::ItemInt *item, - TQWidget *tqparent ); + TQWidget *parent ); /** Register a @ref KPrefsWidDate object. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ KPrefsWidDate *addWidDate( KConfigSkeleton::ItemDateTime *item, - TQWidget *tqparent ); + TQWidget *parent ); /** Register a @ref KPrefsWidTime object. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ KPrefsWidTime *addWidTime( KConfigSkeleton::ItemDateTime *item, - TQWidget *tqparent ); + TQWidget *parent ); /** Register a @ref KPrefsWidDuration object. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ KPrefsWidDuration *addWidDuration( KConfigSkeleton::ItemDateTime *item, - TQWidget *tqparent ); + TQWidget *parent ); /** Register a @ref KPrefsWidColor object. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ KPrefsWidColor *addWidColor( KConfigSkeleton::ItemColor *item, - TQWidget *tqparent ); + TQWidget *parent ); /** Register a @ref KPrefsWidRadios object. The choices represented by the given item object are automatically added as radio buttons. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ KPrefsWidRadios *addWidRadios( KConfigSkeleton::ItemEnum *item, - TQWidget *tqparent ); + TQWidget *parent ); /** Register a @ref KPrefsWidCombo object. The choices represented by the given item object are automatically added to the combo box. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ KPrefsWidCombo *addWidCombo( KConfigSkeleton::ItemEnum *item, - TQWidget *tqparent ); + TQWidget *parent ); /** Register a @ref KPrefsWidString object. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ KPrefsWidString *addWidString( KConfigSkeleton::ItemString *item, - TQWidget *tqparent ); + TQWidget *parent ); /** Register a path @ref KPrefsWidPath object. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. @param filter URLRequester filter @param mode URLRequester mode */ - KPrefsWidPath *addWidPath ( KConfigSkeleton::ItemPath *item, TQWidget *tqparent, + KPrefsWidPath *addWidPath ( KConfigSkeleton::ItemPath *item, TQWidget *parent, const TQString &filter = TQString(), uint mode = KFile::File ); @@ -674,21 +674,21 @@ class KDE_EXPORT KPrefsWidManager Register a password @ref KPrefsWidString object, with echomode set to TQLineEdit::Password. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. */ KPrefsWidString *addWidPassword ( KConfigSkeleton::ItemString *item, - TQWidget *tqparent ); + TQWidget *parent ); /** Register a @ref KPrefsWidFont object. @param item The KConfigSkeletonItem representing the preferences entry. - @param tqparent Parent widget. + @param parent Parent widget. @param sampleText Sample text for previewing the selected font. */ KPrefsWidFont *addWidFont( KConfigSkeleton::ItemFont *item, - TQWidget *tqparent, const TQString &sampleText ); + TQWidget *parent, const TQString &sampleText ); /** Set all widgets to default values. */ void setWidDefaults(); @@ -727,11 +727,11 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager Create a KPrefsDialog for a KPrefs object. @param prefs KPrefs object used to access te configuration. - @param tqparent Parent widget. + @param parent Parent widget. @param name Widget name. @param modal true, if dialog has to be modal, false for non-modal. */ - KPrefsDialog( KConfigSkeleton *prefs, TQWidget *tqparent = 0, char *name = 0, + KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent = 0, char *name = 0, bool modal = false ); /** Destructor. @@ -777,7 +777,7 @@ class KDE_EXPORT KPrefsModule : public KCModule, public KPrefsWidManager Q_OBJECT TQ_OBJECT public: - KPrefsModule( KConfigSkeleton *, TQWidget *tqparent = 0, const char *name = 0 ); + KPrefsModule( KConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 ); virtual void addWid( KPrefsWid * ); diff --git a/libkdepim/krsqueezedtextlabel.cpp b/libkdepim/krsqueezedtextlabel.cpp index 512db73cf..ef9746ee0 100644 --- a/libkdepim/krsqueezedtextlabel.cpp +++ b/libkdepim/krsqueezedtextlabel.cpp @@ -22,15 +22,15 @@ #include "kstringhandler.h" #include <tqtooltip.h> -KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ) { +KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); fullText = text; squeezeTextToLabel(); } -KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ) { +KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); } diff --git a/libkdepim/krsqueezedtextlabel.h b/libkdepim/krsqueezedtextlabel.h index 0b54da784..f6a745275 100644 --- a/libkdepim/krsqueezedtextlabel.h +++ b/libkdepim/krsqueezedtextlabel.h @@ -46,8 +46,8 @@ public: /** * Default constructor. */ - KRSqueezedTextLabel( TQWidget *tqparent, const char *name = 0 ); - KRSqueezedTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 ); + KRSqueezedTextLabel( TQWidget *parent, const char *name = 0 ); + KRSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); virtual TQSize tqminimumSizeHint() const; virtual TQSize tqsizeHint() const; diff --git a/libkdepim/kscoringeditor.cpp b/libkdepim/kscoringeditor.cpp index 0c1a42946..6e520e983 100644 --- a/libkdepim/kscoringeditor.cpp +++ b/libkdepim/kscoringeditor.cpp @@ -160,9 +160,9 @@ ConditionEditWidget::ConditionEditWidget(KScoringManager *m, TQWidget *p, const ConditionEditWidget::~ConditionEditWidget() {} -TQWidget* ConditionEditWidget::createWidget(TQWidget *tqparent) +TQWidget* ConditionEditWidget::createWidget(TQWidget *parent) { - return new SingleConditionWidget(manager,tqparent); + return new SingleConditionWidget(manager,parent); } void ConditionEditWidget::clearWidget(TQWidget *w) @@ -334,9 +334,9 @@ ActionEditWidget::ActionEditWidget(KScoringManager *m,TQWidget *p, const char *n ActionEditWidget::~ActionEditWidget() {} -TQWidget* ActionEditWidget::createWidget( TQWidget *tqparent ) +TQWidget* ActionEditWidget::createWidget( TQWidget *parent ) { - return new SingleActionWidget(manager,tqparent); + return new SingleActionWidget(manager,parent); } void ActionEditWidget::slotEditRule(KScoringRule *rule) @@ -858,8 +858,8 @@ void RuleListWidget::slotRuleDown() KScoringEditor* KScoringEditor::scoreEditor = 0; KScoringEditor::KScoringEditor(KScoringManager* m, - TQWidget *tqparent, const char *name) - : KDialogBase(tqparent,name,false,i18n("Rule Editor"),Ok|Apply|Cancel,Ok,true), manager(m) + TQWidget *parent, const char *name) + : KDialogBase(parent,name,false,i18n("Rule Editor"),Ok|Apply|Cancel,Ok,true), manager(m) { manager->pushRuleList(); if (!scoreEditor) scoreEditor = this; @@ -896,10 +896,10 @@ KScoringEditor::~KScoringEditor() } KScoringEditor* KScoringEditor::createEditor(KScoringManager* m, - TQWidget *tqparent, const char *name) + TQWidget *parent, const char *name) { if (scoreEditor) return scoreEditor; - else return new KScoringEditor(m,tqparent,name); + else return new KScoringEditor(m,parent,name); } void KScoringEditor::setRule(KScoringRule* r) diff --git a/libkdepim/kscoringeditor.h b/libkdepim/kscoringeditor.h index a4e9555d7..fae5f21fe 100644 --- a/libkdepim/kscoringeditor.h +++ b/libkdepim/kscoringeditor.h @@ -138,7 +138,7 @@ class KDE_EXPORT ActionEditWidget : public KWidgetLister public: ActionEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0); ~ActionEditWidget(); - TQWidget* createWidget(TQWidget *tqparent); + TQWidget* createWidget(TQWidget *parent); void updateRule(KScoringRule*); void clearWidget(TQWidget *); public slots: @@ -258,11 +258,11 @@ class KDE_EXPORT KScoringEditor : public KDialogBase public: ~KScoringEditor(); void setRule(KScoringRule*); - static KScoringEditor *createEditor(KScoringManager* m, TQWidget *tqparent=0, const char *name=0); + static KScoringEditor *createEditor(KScoringManager* m, TQWidget *parent=0, const char *name=0); static KScoringEditor *editor() { return scoreEditor; } void setDirty(); protected: - KScoringEditor(KScoringManager* m, TQWidget *tqparent=0, const char *name=0); + KScoringEditor(KScoringManager* m, TQWidget *parent=0, const char *name=0); private: /** the editor for the current rule */ RuleEditWidget* ruleEditor; @@ -287,7 +287,7 @@ class KScoringEditorWidgetDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *tqparent=0, const char *name=0); + KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *parent=0, const char *name=0); protected slots: void slotApply(); void slotOk(); diff --git a/libkdepim/ksubscription.cpp b/libkdepim/ksubscription.cpp index f5aef4a4b..b611e1260 100644 --- a/libkdepim/ksubscription.cpp +++ b/libkdepim/ksubscription.cpp @@ -105,7 +105,7 @@ void GroupItem::setOn( bool on ) //------------------------------------------------------------------------------ void GroupItem::stateChange( bool on ) { - // delegate to tqparent + // delegate to parent if ( !mIgnoreStateChange ) mBrowser->changeItemState(this, on); } @@ -156,8 +156,8 @@ void GroupItem::setVisible( bool b ) for ( ; it.current(); ++it) { // move the checkitem to top - TQListViewItem* tqparent = it.current()->tqparent(); - if (tqparent) tqparent->takeItem(it.current()); + TQListViewItem* parent = it.current()->parent(); + if (parent) parent->takeItem(it.current()); listView()->insertItem(it.current()); } TQListViewItem::setVisible(false); @@ -206,9 +206,9 @@ void GroupItem::setup() //============================================================================= -KSubscription::KSubscription( TQWidget *tqparent, const TQString &caption, +KSubscription::KSubscription( TQWidget *parent, const TQString &caption, KAccount * acct, int buttons, const TQString &user1, bool descriptionColumn ) - : KDialogBase( tqparent, 0, true, caption, buttons | Help | Ok | Cancel, Ok, + : KDialogBase( parent, 0, true, caption, buttons | Help | Ok | Cancel, Ok, true, i18n("Reload &List"), user1 ), mAcct( acct ) { @@ -445,7 +445,7 @@ void KSubscription::changeItemState( GroupItem* item, bool on ) { if (!itemInListView(unsubView, item->info())) { - TQListViewItem *p = item->tqparent(); + TQListViewItem *p = item->parent(); while (p) { // make sure all parents are subscribed @@ -457,7 +457,7 @@ void KSubscription::changeItemState( GroupItem* item, bool on ) pi->setIgnoreStateChange(false); new GroupItem(subView, pi->info(), this); } - p = p->tqparent(); + p = p->parent(); } new GroupItem(subView, item->info(), this); } @@ -560,7 +560,7 @@ void KSubscription::restoreOriginalParent() { TQListViewItem* origParent = static_cast<GroupItem*>(it.current())-> originalParent(); - if (origParent && origParent != it.current()->tqparent()) + if (origParent && origParent != it.current()->parent()) { // remember this to avoid messing up the iterator move.append(it.current()); @@ -569,7 +569,7 @@ void KSubscription::restoreOriginalParent() TQPtrListIterator<TQListViewItem> it2( move ); for ( ; it2.current(); ++it2) { - // restore the original tqparent + // restore the original parent TQListViewItem* origParent = static_cast<GroupItem*>(it2.current())-> originalParent(); groupView->takeItem(it2.current()); @@ -612,12 +612,12 @@ void KSubscription::slotLoadingComplete() noTreeCB->setEnabled(true); subCB->setEnabled(true); - // remember the correct tqparent + // remember the correct parent TQListViewItemIterator it(groupView); for ( ; it.current(); ++it) { static_cast<GroupItem*>(it.current())-> - setOriginalParent( it.current()->tqparent() ); + setOriginalParent( it.current()->parent() ); } emit listChanged(); diff --git a/libkdepim/ksubscription.h b/libkdepim/ksubscription.h index f9ce044aa..6febedfaa 100644 --- a/libkdepim/ksubscription.h +++ b/libkdepim/ksubscription.h @@ -84,10 +84,10 @@ class KDE_EXPORT GroupItem : public TQCheckListItem void setInfo( KGroupInfo info ); /** - * Get/Set the original tqparent + * Get/Set the original parent */ TQListViewItem* originalParent() { return mOriginalParent; } - void setOriginalParent( TQListViewItem* tqparent ) { mOriginalParent = tqparent; } + void setOriginalParent( TQListViewItem* parent ) { mOriginalParent = parent; } /** * Get/Set the last open state @@ -199,7 +199,7 @@ class KDE_EXPORT KSubscription : public KDialogBase Right }; - KSubscription( TQWidget *tqparent, const TQString &caption, KAccount* acct, + KSubscription( TQWidget *parent, const TQString &caption, KAccount* acct, int buttons = 0, const TQString &user1 = TQString(), bool descriptionColumn = true ); diff --git a/libkdepim/ktimeedit.cpp b/libkdepim/ktimeedit.cpp index 8869dbd02..aec230ea5 100644 --- a/libkdepim/ktimeedit.cpp +++ b/libkdepim/ktimeedit.cpp @@ -43,7 +43,7 @@ class KOTimeValidator : public TQValidator { public: - KOTimeValidator(TQWidget* tqparent, const char* name=0) : TQValidator(TQT_TQOBJECT(tqparent), name) {} + KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(TQT_TQOBJECT(parent), name) {} virtual State validate(TQString& str, int& /*cursorPos*/) const { @@ -104,9 +104,9 @@ public: // KTimeWidget/TQTimeEdit provide nicer editing, but don't provide a combobox. // Difficult to get all in one... -// But TQt-3.2 will offer TQLineEdit::setMask, so a "99:99" tqmask would help. -KTimeEdit::KTimeEdit( TQWidget *tqparent, TQTime qt, const char *name ) - : TQComboBox( true, tqparent, name ) +// But TQt-3.2 will offer TQLineEdit::setMask, so a "99:99" mask would help. +KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name ) + : TQComboBox( true, parent, name ) { setInsertionPolicy( NoInsertion ); setValidator( new KOTimeValidator( this ) ); diff --git a/libkdepim/ktimeedit.h b/libkdepim/ktimeedit.h index 1bd86bdf1..b783fc543 100644 --- a/libkdepim/ktimeedit.h +++ b/libkdepim/ktimeedit.h @@ -47,7 +47,7 @@ class KDE_EXPORT KTimeEdit : public TQComboBox TQ_OBJECT public: /** constructs a new time edit. */ - KTimeEdit(TQWidget *tqparent=0, TQTime qt=TQTime(12,0), const char *name=0); + KTimeEdit(TQWidget *parent=0, TQTime qt=TQTime(12,0), const char *name=0); virtual ~KTimeEdit(); diff --git a/libkdepim/kwidgetlister.cpp b/libkdepim/kwidgetlister.cpp index bc9d89803..b2b839f43 100644 --- a/libkdepim/kwidgetlister.cpp +++ b/libkdepim/kwidgetlister.cpp @@ -43,8 +43,8 @@ #include <kpushbutton.h> #include <kdialog.h> -KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *tqparent, const char* name ) - : TQWidget( tqparent, name ) +KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, const char* name ) + : TQWidget( parent, name ) { mWidgetList.setAutoDelete(TRUE); @@ -146,9 +146,9 @@ void KWidgetLister::clearWidget( TQWidget* /*aWidget*/ ) { } -TQWidget* KWidgetLister::createWidget( TQWidget* tqparent ) +TQWidget* KWidgetLister::createWidget( TQWidget* parent ) { - return new TQWidget( tqparent ); + return new TQWidget( parent ); } void KWidgetLister::setNumberOfShownWidgetsTo( int aNum ) diff --git a/libkdepim/kwidgetlister.h b/libkdepim/kwidgetlister.h index 9af7bb9b3..c350ed4b7 100644 --- a/libkdepim/kwidgetlister.h +++ b/libkdepim/kwidgetlister.h @@ -67,7 +67,7 @@ class KDE_EXPORT KWidgetLister : public TQWidget Q_OBJECT TQ_OBJECT public: - KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* tqparent=0, const char* name=0 ); + KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* parent=0, const char* name=0 ); virtual ~KWidgetLister(); protected slots: @@ -100,7 +100,7 @@ protected: when showing it on screen. Make sure you call this implementaion, though, since you cannot put the widget on screen from derived classes (@p mLayout is private). - Make sure the tqparent of the TQWidget to add is this KWidgetLister. */ + Make sure the parent of the TQWidget to add is this KWidgetLister. */ virtual void addWidgetAtEnd(TQWidget *w =0); /** Removes a single (always the last) widget. Doesn't care if there are still only @ref mMinWidgets left on screen and whether it @@ -117,7 +117,7 @@ protected: classes, we are forced to emulate this by forcing the implementers of subclasses of KWidgetLister to reimplement this function which replaces the "@p new @p T" call. */ - virtual TQWidget* createWidget( TQWidget *tqparent ); + virtual TQWidget* createWidget( TQWidget *parent ); /** Sets the number of widgets on scrren to exactly @p aNum. Doesn't check if @p aNum is inside the range @p [mMinWidgets,mMaxWidgets]. */ diff --git a/libkdepim/ldapclient.cpp b/libkdepim/ldapclient.cpp index a7dcfcd26..f8497f084 100644 --- a/libkdepim/ldapclient.cpp +++ b/libkdepim/ldapclient.cpp @@ -76,8 +76,8 @@ void LdapObject::assign( const LdapObject& that ) } } -LdapClient::LdapClient( int clientNumber, TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ), mJob( 0 ), mActive( false ), mReportObjectClass( false ) +LdapClient::LdapClient( int clientNumber, TQObject* parent, const char* name ) + : TQObject( parent, name ), mJob( 0 ), mActive( false ), mReportObjectClass( false ) { // d = new LdapClientPrivate; mClientNumber = clientNumber; diff --git a/libkdepim/ldapclient.h b/libkdepim/ldapclient.h index dba6f1c3f..d9b889556 100644 --- a/libkdepim/ldapclient.h +++ b/libkdepim/ldapclient.h @@ -145,7 +145,7 @@ class KDE_EXPORT LdapClient : public TQObject TQ_OBJECT public: - LdapClient( int clientNumber, TQObject* tqparent = 0, const char* name = 0 ); + LdapClient( int clientNumber, TQObject* parent = 0, const char* name = 0 ); virtual ~LdapClient(); /*! returns true if there is a query running */ diff --git a/libkdepim/ldapsearchdialog.cpp b/libkdepim/ldapsearchdialog.cpp index 36c7517b3..ed1aa2933 100644 --- a/libkdepim/ldapsearchdialog.cpp +++ b/libkdepim/ldapsearchdialog.cpp @@ -101,8 +101,8 @@ namespace KPIM { class ContactListItem : public TQListViewItem { public: - ContactListItem( TQListView* tqparent, const KPIM::LdapAttrMap& attrs ) - : TQListViewItem( tqparent ), mAttrs( attrs ) + ContactListItem( TQListView* parent, const KPIM::LdapAttrMap& attrs ) + : TQListViewItem( parent ), mAttrs( attrs ) { const KPIM::LdapAttrValue &mailAttrs = attrs[ "mail" ]; if ( mailAttrs.isEmpty() ) { @@ -124,9 +124,9 @@ class ContactListItem : public TQListViewItem } -LDAPSearchDialog::LDAPSearchDialog( TQWidget* tqparent, const char* name ) +LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | - User2 | User3 | Cancel, Default, tqparent, name, false, true ) + User2 | User3 | Cancel, Default, parent, name, false, true ) { setButtonCancel( KStdGuiItem::close() ); TQFrame *page = plainPage(); diff --git a/libkdepim/ldapsearchdialog.h b/libkdepim/ldapsearchdialog.h index 4b647acae..45e174efe 100644 --- a/libkdepim/ldapsearchdialog.h +++ b/libkdepim/ldapsearchdialog.h @@ -41,7 +41,7 @@ class LDAPSearchDialog : public KDialogBase TQ_OBJECT public: - LDAPSearchDialog( TQWidget* tqparent, const char* name = 0 ); + LDAPSearchDialog( TQWidget* parent, const char* name = 0 ); ~LDAPSearchDialog(); bool isOK() const { return mIsOK; } diff --git a/libkdepim/maillistdrag.cpp b/libkdepim/maillistdrag.cpp index 3daf889e8..059f730c4 100644 --- a/libkdepim/maillistdrag.cpp +++ b/libkdepim/maillistdrag.cpp @@ -78,8 +78,8 @@ void MailSummary::set( TQ_UINT32 serialNumber, TQString messageId, mDate = date; } -MailListDrag::MailListDrag( MailList mailList, TQWidget * tqparent, MailTextSource *src ) - : TQStoredDrag( MailListDrag::format(), tqparent ), _src(src) +MailListDrag::MailListDrag( MailList mailList, TQWidget * parent, MailTextSource *src ) + : TQStoredDrag( MailListDrag::format(), parent ), _src(src) { setMailList( mailList ); } diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h index 335fa3e28..5d89cd529 100644 --- a/libkdepim/maillistdrag.h +++ b/libkdepim/maillistdrag.h @@ -96,7 +96,7 @@ class KDE_EXPORT MailListDrag : public TQStoredDrag { public: // Takes ownership of "src" and deletes it when done - MailListDrag( MailList, TQWidget * tqparent = 0, MailTextSource *src = 0 ); + MailListDrag( MailList, TQWidget * parent = 0, MailTextSource *src = 0 ); ~MailListDrag(); const char *format(int i) const; diff --git a/libkdepim/overlaywidget.cpp b/libkdepim/overlaywidget.cpp index 209b8c429..ac05d84fd 100644 --- a/libkdepim/overlaywidget.cpp +++ b/libkdepim/overlaywidget.cpp @@ -31,8 +31,8 @@ #include "overlaywidget.h" using namespace KPIM; -OverlayWidget::OverlayWidget( TQWidget* alignWidget, TQWidget* tqparent, const char* name ) - : TQHBox( tqparent, name ), mAlignWidget( 0 ) +OverlayWidget::OverlayWidget( TQWidget* alignWidget, TQWidget* parent, const char* name ) + : TQHBox( parent, name ), mAlignWidget( 0 ) { setAlignWidget( alignWidget ); } diff --git a/libkdepim/overlaywidget.h b/libkdepim/overlaywidget.h index f49b46721..9e611fb92 100644 --- a/libkdepim/overlaywidget.h +++ b/libkdepim/overlaywidget.h @@ -47,7 +47,7 @@ class OverlayWidget : public TQHBox TQ_OBJECT public: - OverlayWidget( TQWidget* alignWidget, TQWidget* tqparent, const char* name = 0 ); + OverlayWidget( TQWidget* alignWidget, TQWidget* parent, const char* name = 0 ); ~OverlayWidget(); TQWidget * alignWidget() { return mAlignWidget; } diff --git a/libkdepim/progressdialog.cpp b/libkdepim/progressdialog.cpp index e12a1b758..bd5b594c6 100644 --- a/libkdepim/progressdialog.cpp +++ b/libkdepim/progressdialog.cpp @@ -60,10 +60,10 @@ namespace KPIM { class TransactionItem; -TransactionItemView::TransactionItemView( TQWidget * tqparent, +TransactionItemView::TransactionItemView( TQWidget * parent, const char * name, WFlags f ) - : TQScrollView( tqparent, name, f ) { + : TQScrollView( parent, name, f ) { setFrameStyle( NoFrame ); mBigBox = new TQVBox( viewport() ); mBigBox->setSpacing( 5 ); @@ -84,9 +84,9 @@ void TransactionItemView::resizeContents( int w, int h ) // (handling of TQEvent::LayoutHint in TQScrollView calls this method) //kdDebug(5300) << k_funcinfo << w << "," << h << endl; TQScrollView::resizeContents( w, h ); - // Tell the tqlayout in the tqparent (progressdialog) that our size changed + // Tell the tqlayout in the parent (progressdialog) that our size changed updateGeometry(); - // Resize the tqparent (progressdialog) - this works but resize horizontally too often + // Resize the parent (progressdialog) - this works but resize horizontally too often //parentWidget()->adjustSize(); TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted ); @@ -139,9 +139,9 @@ void TransactionItemView::slotLayoutFirstItem() // ---------------------------------------------------------------------------- -TransactionItem::TransactionItem( TQWidget* tqparent, +TransactionItem::TransactionItem( TQWidget* parent, ProgressItem *item, bool first ) - : TQVBox( tqparent, "TransactionItem" ), mCancelButton( 0 ), mItem( item ) + : TQVBox( parent, "TransactionItem" ), mCancelButton( 0 ), mItem( item ) { setSpacing( 2 ); @@ -244,8 +244,8 @@ void TransactionItem::addSubTransaction( ProgressItem* /*item*/ ) // --------------------------------------------------------------------------- -ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* tqparent, const char* name ) - : OverlayWidget( alignWidget, tqparent, name ), mWasLastShown( false ) +ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const char* name ) + : OverlayWidget( alignWidget, parent, name ), mWasLastShown( false ) { setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); // TQFrame setSpacing( 0 ); // TQHBox @@ -307,11 +307,11 @@ ProgressDialog::~ProgressDialog() void ProgressDialog::slotTransactionAdded( ProgressItem *item ) { - TransactionItem *tqparent = 0; - if ( item->tqparent() ) { - if ( mTransactionsToListviewItems.contains( item->tqparent() ) ) { - tqparent = mTransactionsToListviewItems[ item->tqparent() ]; - tqparent->addSubTransaction( item ); + TransactionItem *parent = 0; + if ( item->parent() ) { + if ( mTransactionsToListviewItems.contains( item->parent() ) ) { + parent = mTransactionsToListviewItems[ item->parent() ]; + parent->addSubTransaction( item ); } } else { const bool first = mTransactionsToListviewItems.empty(); diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h index 26d9b94d5..91fa771f8 100644 --- a/libkdepim/progressdialog.h +++ b/libkdepim/progressdialog.h @@ -54,7 +54,7 @@ class TransactionItemView : public TQScrollView { Q_OBJECT TQ_OBJECT public: - TransactionItemView( TQWidget * tqparent = 0, + TransactionItemView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); @@ -81,7 +81,7 @@ class TransactionItem : public TQVBox { TQ_OBJECT public: - TransactionItem( TQWidget * tqparent, + TransactionItem( TQWidget * parent, ProgressItem* item, bool first ); ~TransactionItem(); @@ -121,7 +121,7 @@ class KDE_EXPORT ProgressDialog : public OverlayWidget TQ_OBJECT public: - ProgressDialog( TQWidget* alignWidget, TQWidget* tqparent, const char* name = 0 ); + ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const char* name = 0 ); ~ProgressDialog(); void setVisible( bool b ); diff --git a/libkdepim/progressmanager.cpp b/libkdepim/progressmanager.cpp index 9dd80c9dc..a00970c5e 100644 --- a/libkdepim/progressmanager.cpp +++ b/libkdepim/progressmanager.cpp @@ -35,10 +35,10 @@ KPIM::ProgressManager * KPIM::ProgressManager::mInstance = 0; unsigned int KPIM::ProgressManager::uID = 42; ProgressItem::ProgressItem( - ProgressItem* tqparent, const TQString& id, + ProgressItem* parent, const TQString& id, const TQString& label, const TQString& status, bool canBeCanceled, bool usesCrypto ) - :mId( id ), mLabel( label ), mtqStatus( status ), mParent( tqparent ), + :mId( id ), mLabel( label ), mtqStatus( status ), mParent( parent ), mCanBeCanceled( canBeCanceled ), mProgress( 0 ), mTotal( 0 ), mCompleted( 0 ), mWaitingForKids( false ), mCanceled( false ), mUsesCrypto( usesCrypto ), mUsesBusyIndicator( false ) @@ -56,8 +56,8 @@ void ProgressItem::setComplete() if ( !mCanceled ) setProgress( 100 ); emit progressItemCompleted( this ); - if ( tqparent() ) - tqparent()->removeChild( this ); + if ( parent() ) + parent()->removeChild( this ); deleteLater(); } else { mWaitingForKids = true; @@ -147,16 +147,16 @@ ProgressManager* ProgressManager::instance() } ProgressItem* ProgressManager::createProgressItemImpl( - ProgressItem* tqparent, const TQString& id, + ProgressItem* parent, const TQString& id, const TQString &label, const TQString &status, bool cancellable, bool usesCrypto ) { ProgressItem *t = 0; if ( !mTransactions[ id ] ) { - t = new ProgressItem ( tqparent, id, label, status, cancellable, usesCrypto ); + t = new ProgressItem ( parent, id, label, status, cancellable, usesCrypto ); mTransactions.insert( id, t ); - if ( tqparent ) { - ProgressItem *p = mTransactions[ tqparent->id() ]; + if ( parent ) { + ProgressItem *p = mTransactions[ parent->id() ]; if ( p ) { p->addChild( t ); } @@ -188,11 +188,11 @@ ProgressItem* ProgressManager::createProgressItemImpl( } ProgressItem* ProgressManager::createProgressItemImpl( - const TQString& tqparent, const TQString &id, + const TQString& parent, const TQString &id, const TQString &label, const TQString& status, bool canBeCanceled, bool usesCrypto ) { - ProgressItem * p = mTransactions[tqparent]; + ProgressItem * p = mTransactions[parent]; return createProgressItemImpl( p, id, label, status, canBeCanceled, usesCrypto ); } @@ -225,7 +225,7 @@ ProgressItem* ProgressManager::singleItem() const if ( (*it)->usesBusyIndicator() ) return 0; - if ( !(*it)->tqparent() ) { // if it's a top level one, only those count + if ( !(*it)->parent() ) { // if it's a top level one, only those count if ( item ) return 0; // we found more than one else diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h index 3edffd0d5..7798162d3 100644 --- a/libkdepim/progressmanager.h +++ b/libkdepim/progressmanager.h @@ -52,9 +52,9 @@ class KDE_EXPORT ProgressItem : public TQObject const TQString& id() const { return mId; } /** - * @return The tqparent item of this one, if there is one. + * @return The parent item of this one, if there is one. */ - ProgressItem *tqparent() const { return mParent; } + ProgressItem *parent() const { return mParent; } /** * @return The user visible string to be used to represent this item. @@ -217,7 +217,7 @@ signals: protected: /* Only to be used by our good friend the ProgressManager */ - ProgressItem( ProgressItem* tqparent, + ProgressItem( ProgressItem* parent, const TQString& id, const TQString& label, const TQString& status, @@ -288,7 +288,7 @@ class KDE_EXPORT ProgressManager : public TQObject /** * Creates a ProgressItem with a unique id and the given label. * This is the simplest way to aquire a progress item. It will not - * have a tqparent and will be set to be cancellable and not using crypto. + * have a parent and will be set to be cancellable and not using crypto. * * @param label The text to be displayed by progress handlers. It will be * interpreted as rich text, so it might have to be escaped. @@ -299,10 +299,10 @@ class KDE_EXPORT ProgressManager : public TQObject } /** - * Creates a new progressItem with the given tqparent, id, label and initial + * Creates a new progressItem with the given parent, id, label and initial * status. * - * @param tqparent Specify an already existing item as the tqparent of this one. + * @param parent Specify an already existing item as the parent of this one. * @param id Used to identify this operation for cancel and progress info. * @param label The text to be displayed by progress handlers. It will be * interpreted as rich text, so it might have to be escaped. @@ -310,36 +310,36 @@ class KDE_EXPORT ProgressManager : public TQObject * interpreted as rich text, so it might have to be escaped. * @param canBeCanceled can the user cancel this operation? * @param usesCrypto does the operation use secure transports (SSL) - * Cancelling the tqparent will cancel the tqchildren as well (if they can be + * Cancelling the parent will cancel the tqchildren as well (if they can be * cancelled) and ongoing tqchildren prevent parents from finishing. * @return The ProgressItem representing the operation. */ - static ProgressItem * createProgressItem( ProgressItem* tqparent, + static ProgressItem * createProgressItem( ProgressItem* parent, const TQString& id, const TQString& label, const TQString& status = TQString(), bool canBeCanceled = true, bool usesCrypto = false ) { - return instance()->createProgressItemImpl( tqparent, id, label, status, + return instance()->createProgressItemImpl( parent, id, label, status, canBeCanceled, usesCrypto ); } /** - * Use this version if you have the id string of the tqparent and want to + * Use this version if you have the id string of the parent and want to * add a subjob to it. */ - static ProgressItem * createProgressItem( const TQString& tqparent, + static ProgressItem * createProgressItem( const TQString& parent, const TQString& id, const TQString& label, const TQString& status = TQString(), bool canBeCanceled = true, bool usesCrypto = false ) { - return instance()->createProgressItemImpl( tqparent, id, label, + return instance()->createProgressItemImpl( parent, id, label, status, canBeCanceled, usesCrypto ); } /** - * Version without a tqparent. + * Version without a parent. */ static ProgressItem * createProgressItem( const TQString& id, const TQString& label, @@ -419,11 +419,11 @@ class KDE_EXPORT ProgressManager : public TQObject ProgressManager( const ProgressManager& ); virtual ProgressItem* createProgressItemImpl( - ProgressItem* tqparent, const TQString& id, + ProgressItem* parent, const TQString& id, const TQString& label, const TQString& status, bool cancellable, bool usesCrypto ); virtual ProgressItem* createProgressItemImpl( - const TQString& tqparent, const TQString& id, + const TQString& parent, const TQString& id, const TQString& label, const TQString& status, bool cancellable, bool usesCrypto ); void emitShowProgressDialogImpl(); diff --git a/libkdepim/qutf7codec.cpp b/libkdepim/qutf7codec.cpp index db6589cd9..dc8ef2a2f 100644 --- a/libkdepim/qutf7codec.cpp +++ b/libkdepim/qutf7codec.cpp @@ -374,8 +374,8 @@ private: // if mayContinue, this char has already been written *t++ = toBase64( outbits | ( u >> 14 ) ); } - *t++ = toBase64( (u & 0x3F00 /* tqmask top 2 bits */ ) >> 8 ); - *t++ = toBase64( (u & 0x00FC /* tqmask msbyte */ ) >> 2 ); + *t++ = toBase64( (u & 0x3F00 /* mask top 2 bits */ ) >> 8 ); + *t++ = toBase64( (u & 0x00FC /* mask msbyte */ ) >> 2 ); // save 2 lowest-significant bits in outbits[5..4] outbits = (u & 0x0003) << 4; break; diff --git a/libkdepim/recentaddresses.cpp b/libkdepim/recentaddresses.cpp index 6e1054d1d..ac790693d 100644 --- a/libkdepim/recentaddresses.cpp +++ b/libkdepim/recentaddresses.cpp @@ -157,9 +157,9 @@ TQStringList RecentAddresses::addresses() const return addresses; } -RecentAddressDialog::RecentAddressDialog( TQWidget *tqparent, const char *name ) +RecentAddressDialog::RecentAddressDialog( TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Edit Recent Addresses" ), Ok | Cancel, Ok, - tqparent, name, true ) + parent, name, true ) { TQWidget *page = plainPage(); TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() ); diff --git a/libkdepim/recentaddresses.h b/libkdepim/recentaddresses.h index f7ec276ec..be7633694 100644 --- a/libkdepim/recentaddresses.h +++ b/libkdepim/recentaddresses.h @@ -44,7 +44,7 @@ namespace KRecentAddress { class KDE_EXPORT RecentAddressDialog : public KDialogBase { public: - RecentAddressDialog( TQWidget *tqparent, const char *name = 0 ); + RecentAddressDialog( TQWidget *parent, const char *name = 0 ); void setAddresses( const TQStringList &addrs ); TQStringList addresses() const; private: diff --git a/libkdepim/sendsmsdialog.cpp b/libkdepim/sendsmsdialog.cpp index d034fd73f..03c5af568 100644 --- a/libkdepim/sendsmsdialog.cpp +++ b/libkdepim/sendsmsdialog.cpp @@ -27,8 +27,8 @@ #include "sendsmsdialog.h" -SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *tqparent, const char *name ) - : KDialogBase( Plain, i18n( "Send SMS" ), Ok | Cancel, Ok, tqparent, name, true, true ) +SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, const char *name ) + : KDialogBase( Plain, i18n( "Send SMS" ), Ok | Cancel, Ok, parent, name, true, true ) { TQWidget *page = plainPage(); diff --git a/libkdepim/sendsmsdialog.h b/libkdepim/sendsmsdialog.h index 43bfe72e8..4430fc1a8 100644 --- a/libkdepim/sendsmsdialog.h +++ b/libkdepim/sendsmsdialog.h @@ -33,7 +33,7 @@ class SendSMSDialog : public KDialogBase TQ_OBJECT public: - SendSMSDialog( const TQString &recipientName, TQWidget *tqparent, const char *name = 0 ); + SendSMSDialog( const TQString &recipientName, TQWidget *parent, const char *name = 0 ); TQString text() const; diff --git a/libkdepim/sidebarextension.cpp b/libkdepim/sidebarextension.cpp index 1ce8e9a8e..dc3413ebc 100644 --- a/libkdepim/sidebarextension.cpp +++ b/libkdepim/sidebarextension.cpp @@ -26,8 +26,8 @@ using namespace KParts; -SideBarExtension::SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *tqparent, const char* name) -: TQObject(tqparent, name), m_exported(exported), d(0) +SideBarExtension::SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *parent, const char* name) +: TQObject(parent, name), m_exported(exported), d(0) { } diff --git a/libkdepim/sidebarextension.h b/libkdepim/sidebarextension.h index 98b185c17..e5551ff69 100644 --- a/libkdepim/sidebarextension.h +++ b/libkdepim/sidebarextension.h @@ -46,10 +46,10 @@ namespace KParts * * @param exported A TQWidget derived widget that will be provided for the * users of SideBarExtension. - * @param tqparent The tqparent widget. + * @param parent The parent widget. * @param name The name of the class. **/ - SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *tqparent, const char* name); + SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *parent, const char* name); ~SideBarExtension(); /** diff --git a/libkdepim/ssllabel.cpp b/libkdepim/ssllabel.cpp index 1349d4e80..8068aa001 100644 --- a/libkdepim/ssllabel.cpp +++ b/libkdepim/ssllabel.cpp @@ -41,8 +41,8 @@ namespace KPIM { -SSLLabel::SSLLabel( TQWidget* tqparent ) - : TQLabel( tqparent ) +SSLLabel::SSLLabel( TQWidget* parent ) + : TQLabel( parent ) { setState( Done ); } diff --git a/libkdepim/ssllabel.h b/libkdepim/ssllabel.h index 81f1d2273..03a841bed 100644 --- a/libkdepim/ssllabel.h +++ b/libkdepim/ssllabel.h @@ -45,7 +45,7 @@ namespace KPIM { Clean, Done }; - SSLLabel( TQWidget* tqparent ); + SSLLabel( TQWidget* parent ); void setEncrypted( bool enc=true ); void setState( State state ); diff --git a/libkdepim/statusbarprogresswidget.cpp b/libkdepim/statusbarprogresswidget.cpp index 2b2ef1dbc..c417905a0 100644 --- a/libkdepim/statusbarprogresswidget.cpp +++ b/libkdepim/statusbarprogresswidget.cpp @@ -58,8 +58,8 @@ using KPIM::ProgressManager; using namespace KPIM; //----------------------------------------------------------------------------- -StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* tqparent, bool button ) - : TQFrame( tqparent ), mCurrentItem( 0 ), mProgressDialog( progressDialog ), +StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* parent, bool button ) + : TQFrame( parent ), mCurrentItem( 0 ), mProgressDialog( progressDialog ), mDelayTimer( 0 ), mBusyTimer( 0 ) { m_bShowButton = button; @@ -141,7 +141,7 @@ void StatusbarProgressWidget::updateBusyMode() void StatusbarProgressWidget::slotProgressItemAdded( ProgressItem *item ) { - if ( item->tqparent() ) + if ( item->parent() ) return; // we are only interested in top level items updateBusyMode(); @@ -149,7 +149,7 @@ void StatusbarProgressWidget::slotProgressItemAdded( ProgressItem *item ) void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item ) { - if ( item->tqparent() ) return; // we are only interested in top level items + if ( item->parent() ) return; // we are only interested in top level items connectSingleItem(); // if going back to 1 item if ( ProgressManager::instance()->isEmpty() ) { // No item // Done. In 5s the progress-widget will close, then we can clean up the statusbar diff --git a/libkdepim/statusbarprogresswidget.h b/libkdepim/statusbarprogresswidget.h index 3a4734952..1c8365426 100644 --- a/libkdepim/statusbarprogresswidget.h +++ b/libkdepim/statusbarprogresswidget.h @@ -58,7 +58,7 @@ class KDE_EXPORT StatusbarProgressWidget : public TQFrame { public: - StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* tqparent, bool button = true ); + StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* parent, bool button = true ); public slots: diff --git a/libkdepim/tests/testdateedit.cpp b/libkdepim/tests/testdateedit.cpp index 6b4ef3392..e0d1d732d 100644 --- a/libkdepim/tests/testdateedit.cpp +++ b/libkdepim/tests/testdateedit.cpp @@ -31,8 +31,8 @@ #include "testdateedit.h" -DateEdit::DateEdit( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +DateEdit::DateEdit( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); diff --git a/libkdepim/tests/testdateedit.h b/libkdepim/tests/testdateedit.h index 44cb214a4..816e87e77 100644 --- a/libkdepim/tests/testdateedit.h +++ b/libkdepim/tests/testdateedit.h @@ -30,7 +30,7 @@ class DateEdit : public TQWidget TQ_OBJECT public: - DateEdit( TQWidget *tqparent = 0, const char *name = 0 ); + DateEdit( TQWidget *parent = 0, const char *name = 0 ); public slots: void dateChanged( const TQDate& ); diff --git a/libkdepim/weaver.cpp b/libkdepim/weaver.cpp index 0e718e019..b1dba8de7 100644 --- a/libkdepim/weaver.cpp +++ b/libkdepim/weaver.cpp @@ -28,8 +28,8 @@ namespace ThreadWeaver { bool Debug = true; int DebugLevel = 2; - Job::Job (TQObject* tqparent, const char* name) - : TQObject (tqparent, name), + Job::Job (TQObject* parent, const char* name) + : TQObject (parent, name), m_finished (false), m_mutex (new TQMutex (true) ), m_thread (0) @@ -178,9 +178,9 @@ namespace ThreadWeaver { unsigned int Thread::sm_Id; - Thread::Thread (Weaver *tqparent) + Thread::Thread (Weaver *parent) : TQThread (), - m_tqparent ( tqparent ), + m_parent ( parent ), m_id ( makeId() ) { } @@ -212,7 +212,7 @@ namespace ThreadWeaver { { debug ( 3, "Thread::run [%u]: trying to execute the next job.\n", id() ); - job = m_tqparent->applyForWork ( this, job ); + job = m_parent->applyForWork ( this, job ); if (job == 0) { @@ -229,7 +229,7 @@ namespace ThreadWeaver { void Thread::post (Event::Action a, Job *j) { - m_tqparent->post ( a, this, j); + m_parent->post ( a, this, j); } void Thread::msleep(unsigned long msec) @@ -237,9 +237,9 @@ namespace ThreadWeaver { TQThread::msleep(msec); } - Weaver::Weaver(TQObject* tqparent, const char* name, + Weaver::Weaver(TQObject* parent, const char* name, int inventoryMin, int inventoryMax) - : TQObject(tqparent, name), + : TQObject(parent, name), m_active(0), m_inventoryMin(inventoryMin), m_inventoryMax(inventoryMax), diff --git a/libkdepim/weaver.h b/libkdepim/weaver.h index 43d4368d0..33989e126 100644 --- a/libkdepim/weaver.h +++ b/libkdepim/weaver.h @@ -167,7 +167,7 @@ namespace ThreadWeaver { TQ_OBJECT public: /** Construct a Job object. */ - Job(TQObject* tqparent=0, const char* name=0); + Job(TQObject* parent=0, const char* name=0); /** Destructor. */ virtual ~Job(); @@ -251,9 +251,9 @@ namespace ThreadWeaver { { public: /** Create a thread. - These thread objects are only used inside the Weaver tqparent + These thread objects are only used inside the Weaver parent object. */ - Thread(Weaver *tqparent); + Thread(Weaver *parent); /** The destructor. */ ~Thread(); @@ -261,7 +261,7 @@ namespace ThreadWeaver { /** Overloaded to execute the assigned job. This will NOT return until shutdown() is called. The thread will try to execute one job after the other, asking - the Weaver tqparent for a new job when the assigned one is + the Weaver parent for a new job when the assigned one is finished. If no jobs are available, the thread will suspend. After shutdown() is called, the thread will end as soon as @@ -283,7 +283,7 @@ namespace ThreadWeaver { void post (Event::Action, Job* = 0); private: - Weaver *m_tqparent; + Weaver *m_parent; const unsigned int m_id; @@ -299,7 +299,7 @@ namespace ThreadWeaver { Q_OBJECT TQ_OBJECT public: - Weaver (TQObject* tqparent=0, const char* name=0, + Weaver (TQObject* parent=0, const char* name=0, int inventoryMin = 4, // minimal number of provided threads int inventoryMax = 32); // maximum number of provided threads virtual ~Weaver (); diff --git a/libkdepim/weaverextensions.cpp b/libkdepim/weaverextensions.cpp index e0cdfb381..9859b6d6b 100644 --- a/libkdepim/weaverextensions.cpp +++ b/libkdepim/weaverextensions.cpp @@ -19,8 +19,8 @@ namespace KPIM { namespace ThreadWeaver { - WeaverExtension::WeaverExtension ( TQObject *tqparent, const char *name) - : TQObject (tqparent, name) + WeaverExtension::WeaverExtension ( TQObject *parent, const char *name) + : TQObject (parent, name) { } diff --git a/libkdepim/weaverextensions.h b/libkdepim/weaverextensions.h index 53eff64cb..26bccadea 100644 --- a/libkdepim/weaverextensions.h +++ b/libkdepim/weaverextensions.h @@ -35,7 +35,7 @@ namespace ThreadWeaver { Q_OBJECT TQ_OBJECT public: - WeaverExtension ( TQObject *tqparent = 0, const char *name = 0); + WeaverExtension ( TQObject *parent = 0, const char *name = 0); /** Attach() is a convenience method that will connect all our slots to signals emitted by the weaver. It is also possible to avoid attach() and only connect necessary signals. */ diff --git a/libkdepim/weaverlogger.cpp b/libkdepim/weaverlogger.cpp index 14b3c5051..e5164c804 100644 --- a/libkdepim/weaverlogger.cpp +++ b/libkdepim/weaverlogger.cpp @@ -21,8 +21,8 @@ namespace ThreadWeaver { extern void debug(int severity, const char * cformat, ...); - WeaverThreadLogger::WeaverThreadLogger( TQObject *tqparent, const char *name) - : WeaverExtension (tqparent, name) + WeaverThreadLogger::WeaverThreadLogger( TQObject *parent, const char *name) + : WeaverExtension (parent, name) { } diff --git a/libkdepim/weaverlogger.h b/libkdepim/weaverlogger.h index ece3ddea1..d4d35ff4f 100644 --- a/libkdepim/weaverlogger.h +++ b/libkdepim/weaverlogger.h @@ -28,7 +28,7 @@ namespace ThreadWeaver { Q_OBJECT TQ_OBJECT public: - WeaverThreadLogger( TQObject *tqparent = 0, const char *name = 0); + WeaverThreadLogger( TQObject *parent = 0, const char *name = 0); ~WeaverThreadLogger(); void threadCreated (Thread *); void threadDestroyed (Thread *); diff --git a/libkmime/CLASSTREE.headers b/libkmime/CLASSTREE.headers index 5e7a9ee07..0dc759261 100644 --- a/libkmime/CLASSTREE.headers +++ b/libkmime/CLASSTREE.headers @@ -59,7 +59,7 @@ bool isEmpty() const char* type(); -Entity* tqparent(); +Entity* parent(); void setParent( Content* ); diff --git a/libkmime/boolflags.cpp b/libkmime/boolflags.cpp index a9ba7a9f8..981e4ecc5 100644 --- a/libkmime/boolflags.cpp +++ b/libkmime/boolflags.cpp @@ -20,7 +20,7 @@ void BoolFlags::set(unsigned int i, bool b) { if(i>15) return; - unsigned char p; //bitqmask + unsigned char p; //bimask int n; if(i<8) { //first byte @@ -43,7 +43,7 @@ bool BoolFlags::get(unsigned int i) { if(i>15) return false; - unsigned char p; //bitqmask + unsigned char p; //bimask int n; if(i<8) { //first byte diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h index 69f139a57..458258640 100644 --- a/libkmime/kmime_headers.h +++ b/libkmime/kmime_headers.h @@ -116,16 +116,16 @@ class KDE_EXPORT Base { /** Create an empty header. */ Base() : e_ncCS(0), p_arent(0) {} - /** Create an empty header with a tqparent-content. */ - Base(KMime::Content *tqparent) : e_ncCS(0), p_arent(tqparent) {} + /** Create an empty header with a parent-content. */ + Base(KMime::Content *parent) : e_ncCS(0), p_arent(parent) {} /** Destructor */ virtual ~Base() {} - /** Return the tqparent of this header. */ - KMime::Content* tqparent() { return p_arent; } + /** Return the parent of this header. */ + KMime::Content* parent() { return p_arent; } - /** Set the tqparent for this header. */ + /** Set the parent for this header. */ void setParent(KMime::Content *p) { p_arent=p; } /** Parse the given string. Take care of RFC2047-encoded diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp index f3a79216e..53058d55b 100644 --- a/libkpgp/kpgpbase.cpp +++ b/libkpgp/kpgpbase.cpp @@ -128,7 +128,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) _exit(127); } - /*Only get here if we're the tqparent.*/ + /*Only get here if we're the parent.*/ close(pin[0]); close(pout[1]); close(perr[1]); @@ -500,7 +500,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) _exit(127); } - // Only get here if we're the tqparent. + // Only get here if we're the parent. close(pin[0]); close(pout[1]); diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index cb07abc41..a52680b19 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -58,10 +58,10 @@ const int Kpgp::KeySelectionDialog::sCheckSelectionDelay = 250; namespace Kpgp { -PassphraseDialog::PassphraseDialog( TQWidget *tqparent, +PassphraseDialog::PassphraseDialog( TQWidget *parent, const TQString &caption, bool modal, const TQString &keyID ) - :KDialogBase( tqparent, 0, modal, caption, Ok|Cancel ) + :KDialogBase( parent, 0, modal, caption, Ok|Cancel ) { TQHBox *hbox = makeHBoxMainWidget(); hbox->setSpacing( spacingHint() ); @@ -104,8 +104,8 @@ const char * PassphraseDialog::passphrase() // ------------------------------------------------------------------------ // Forbidden accels for KMail: AC GH OP // for KNode: ACE H O -Config::Config( TQWidget *tqparent, const char *name, bool encrypt ) - : TQWidget( tqparent, name ), pgp( Module::getKpgp() ) +Config::Config( TQWidget *parent, const char *name, bool encrypt ) + : TQWidget( parent, name ), pgp( Module::getKpgp() ) { TQGroupBox * group; TQLabel * label; @@ -286,9 +286,9 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, const bool rememberChoice, const unsigned int allowedKeys, const bool extendedSelection, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal ) - : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel, Ok ), + : KDialogBase( parent, name, modal, title, Default|Ok|Cancel, Ok ), mRememberCB( 0 ), mAllowedKeys( allowedKeys ), mCurrentContextMenuItem( 0 ) @@ -670,8 +670,8 @@ void KeySelectionDialog::updateKeyInfo( const Kpgp::Key* key, return; } - if( lvi->tqparent() != 0 ) { - lvi = lvi->tqparent(); + if( lvi->parent() != 0 ) { + lvi = lvi->parent(); } if( 0 == key ) { @@ -788,8 +788,8 @@ KeySelectionDialog::getKeyId( const TQListViewItem* lvi ) const KeyID keyId; if( 0 != lvi ) { - if( 0 != lvi->tqparent() ) { - keyId = lvi->tqparent()->text(0).local8Bit(); + if( 0 != lvi->parent() ) { + keyId = lvi->parent()->text(0).local8Bit(); } else { keyId = lvi->text(0).local8Bit(); @@ -1158,9 +1158,9 @@ void KeySelectionDialog::showAllItems() } // ------------------------------------------------------------------------ -KeyRequester::KeyRequester( TQWidget * tqparent, bool multipleKeys, +KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys, unsigned int allowedKeys, const char * name ) - : TQWidget( tqparent, name ), + : TQWidget( parent, name ), mDialogCaption( i18n("OpenPGP Key Selection") ), mDialogMessage( i18n("Please select an OpenPGP key to use.") ), mMulti( multipleKeys ), @@ -1268,9 +1268,9 @@ void KeyRequester::setAllowedKeys( int allowedKeys ) { } -PublicKeyRequester::PublicKeyRequester( TQWidget * tqparent, bool multi, +PublicKeyRequester::PublicKeyRequester( TQWidget * parent, bool multi, unsigned int allowed, const char * name ) - : KeyRequester( tqparent, multi, allowed & ~SecretKeys, name ) + : KeyRequester( parent, multi, allowed & ~SecretKeys, name ) { } @@ -1284,9 +1284,9 @@ KeyIDList PublicKeyRequester::keyRequestHook( Module * pgp ) const { return pgp->selectPublicKeys( mDialogCaption, mDialogMessage, mKeys, TQString(), mAllowedKeys ); } -SecretKeyRequester::SecretKeyRequester( TQWidget * tqparent, bool multi, +SecretKeyRequester::SecretKeyRequester( TQWidget * parent, bool multi, unsigned int allowed, const char * name ) - : KeyRequester( tqparent, multi, allowed & ~PublicKeys, name ) + : KeyRequester( parent, multi, allowed & ~PublicKeys, name ) { } @@ -1310,9 +1310,9 @@ KeyIDList SecretKeyRequester::keyRequestHook( Module * pgp ) const { KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, const TQValueVector<KeyIDList>& keyIDs, const int allowedKeys, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("Encryption Key Approval"), + : KDialogBase( parent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ), mKeys( keyIDs ), mAllowedKeys( allowedKeys ), @@ -1614,9 +1614,9 @@ KeyApprovalDialog::slotCancel() // ------------------------------------------------------------------------ CipherTextDialog::CipherTextDialog( const TQCString & text, - const TQCString & charset, TQWidget *tqparent, + const TQCString & charset, TQWidget *parent, const char *name, bool modal ) - :KDialogBase( tqparent, name, modal, i18n("OpenPGP Information"), Ok|Cancel, Ok) + :KDialogBase( parent, name, modal, i18n("OpenPGP Information"), Ok|Cancel, Ok) { // FIXME (post KDE2.2): show some more info, e.g. the output of GnuPG/PGP TQFrame *page = makeMainWidget(); diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h index 1c24373a9..4644edcf1 100644 --- a/libkpgp/kpgpui.h +++ b/libkpgp/kpgpui.h @@ -58,7 +58,7 @@ class KDE_EXPORT PassphraseDialog : public KDialogBase TQ_OBJECT public: - PassphraseDialog( TQWidget *tqparent=0, const TQString &caption=TQString(), + PassphraseDialog( TQWidget *parent=0, const TQString &caption=TQString(), bool modal=true, const TQString &keyID=TQString()); virtual ~PassphraseDialog(); @@ -79,7 +79,7 @@ class KDE_EXPORT Config : public TQWidget TQ_OBJECT public: - Config(TQWidget *tqparent = 0, const char *name = 0, bool encrypt =true); + Config(TQWidget *parent = 0, const char *name = 0, bool encrypt =true); virtual ~Config(); virtual void setValues(); @@ -121,7 +121,7 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper const bool rememberChoice = false, const unsigned int allowedKeys = AllKeys, const bool extendedSelection = false, - TQWidget *tqparent=0, const char *name=0, + TQWidget *parent=0, const char *name=0, bool modal=true ); virtual ~KeySelectionDialog(); @@ -207,7 +207,7 @@ class KDE_EXPORT KeyRequester: public TQWidget TQ_OBJECT public: - KeyRequester( TQWidget * tqparent=0, bool multipleKeys=false, + KeyRequester( TQWidget * parent=0, bool multipleKeys=false, unsigned int allowedKeys=AllKeys, const char * name=0 ); virtual ~KeyRequester(); @@ -258,7 +258,7 @@ class KDE_EXPORT PublicKeyRequester : public KeyRequester { Q_OBJECT TQ_OBJECT public: - PublicKeyRequester( TQWidget * tqparent=0, bool multipleKeys=false, + PublicKeyRequester( TQWidget * parent=0, bool multipleKeys=false, unsigned int allowedKeys=PublicKeys, const char * name=0 ); virtual ~PublicKeyRequester(); @@ -278,7 +278,7 @@ class KDE_EXPORT SecretKeyRequester : public KeyRequester { Q_OBJECT TQ_OBJECT public: - SecretKeyRequester( TQWidget * tqparent=0, bool multipleKeys=false, + SecretKeyRequester( TQWidget * parent=0, bool multipleKeys=false, unsigned int allowedKeys=SecretKeys, const char * name=0 ); virtual ~SecretKeyRequester(); @@ -304,7 +304,7 @@ class KDE_EXPORT KeyApprovalDialog: public KDialogBase KeyApprovalDialog( const TQStringList&, const TQValueVector<KeyIDList>&, const int allowedKeys, - TQWidget *tqparent = 0, const char *name = 0, + TQWidget *parent = 0, const char *name = 0, bool modal = true ); virtual ~KeyApprovalDialog() {}; @@ -338,7 +338,7 @@ class KDE_EXPORT CipherTextDialog: public KDialogBase public: CipherTextDialog( const TQCString & text, const TQCString & charset=0, - TQWidget *tqparent=0, const char *name=0, bool modal=true ); + TQWidget *parent=0, const char *name=0, bool modal=true ); virtual ~CipherTextDialog() {}; private: diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp index a8fad42f9..911e8f59d 100644 --- a/libkpimexchange/core/exchangeprogress.cpp +++ b/libkpimexchange/core/exchangeprogress.cpp @@ -33,8 +33,8 @@ #include "exchangeprogress.h" using namespace KPIM; -ExchangeProgress::ExchangeProgress(TQWidget *tqparent) - : KProgressDialog(tqparent, "", i18n("Exchange Download Progress"), i18n("Exchange Plugin"), "text" ) +ExchangeProgress::ExchangeProgress(TQWidget *parent) + : KProgressDialog(parent, "", i18n("Exchange Download Progress"), i18n("Exchange Plugin"), "text" ) { m_finished = 0; m_total = 0; diff --git a/libkpimexchange/core/exchangeprogress.h b/libkpimexchange/core/exchangeprogress.h index 17438c18d..f3db0be91 100644 --- a/libkpimexchange/core/exchangeprogress.h +++ b/libkpimexchange/core/exchangeprogress.h @@ -32,7 +32,7 @@ class ExchangeProgress : public KProgressDialog TQ_OBJECT public: - ExchangeProgress(TQWidget *tqparent=0); + ExchangeProgress(TQWidget *parent=0); virtual ~ExchangeProgress(); public slots: diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp index 636483c74..1b250fa34 100644 --- a/libkpimidentities/identitycombo.cpp +++ b/libkpimidentities/identitycombo.cpp @@ -43,8 +43,8 @@ using namespace KPIM; -IdentityCombo::IdentityCombo( IdentityManager* manager, TQWidget * tqparent, const char * name ) - : TQComboBox( false, tqparent, name ), mIdentityManager( manager ) +IdentityCombo::IdentityCombo( IdentityManager* manager, TQWidget * parent, const char * name ) + : TQComboBox( false, parent, name ), mIdentityManager( manager ) { reloadCombo(); reloadUoidList(); diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h index b76c6cc89..7e0aafd75 100644 --- a/libkpimidentities/identitycombo.h +++ b/libkpimidentities/identitycombo.h @@ -52,7 +52,7 @@ class KDE_EXPORT IdentityCombo : public TQComboBox { Q_OBJECT TQ_OBJECT public: - IdentityCombo( IdentityManager* manager, TQWidget * tqparent=0, const char * name=0 ); + IdentityCombo( IdentityManager* manager, TQWidget * parent=0, const char * name=0 ); TQString currentIdentityName() const; uint currentIdentity() const; diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 8d1fa8449..22036f8d0 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -66,8 +66,8 @@ static TQCString newDCOPObjectName() return name; } -IdentityManager::IdentityManager( bool readonly, TQObject * tqparent, const char * name ) - : ConfigManager( tqparent, name ), DCOPObject( newDCOPObjectName() ) +IdentityManager::IdentityManager( bool readonly, TQObject * parent, const char * name ) + : ConfigManager( parent, name ), DCOPObject( newDCOPObjectName() ) { mReadOnly = readonly; mConfig = new KConfig( "emailidentities", readonly ); diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h index f02cca901..17ec6b868 100644 --- a/libkpimidentities/identitymanager.h +++ b/libkpimidentities/identitymanager.h @@ -66,7 +66,7 @@ public: * This means in particular that if there is no identity configured, * the default identity created here will not be saved. */ - IdentityManager( bool readonly = false, TQObject * tqparent=0, const char * name=0 ); + IdentityManager( bool readonly = false, TQObject * parent=0, const char * name=0 ); virtual ~IdentityManager(); public: diff --git a/mimelib/Tutorial b/mimelib/Tutorial index dfa98156a..358fab7e5 100644 --- a/mimelib/Tutorial +++ b/mimelib/Tutorial @@ -95,9 +95,9 @@ new header field) to the DwHeaders object (representing the header), the is-modified flag will be set for the DwHeaders object, indicating that the string representation of the DwHeaders object will have to be re-assembled from the header fields that it contains. When a node's is-modified flag is -set, it also notifies its tqparent node to set its is-modified flag. Thus, +set, it also notifies its parent node to set its is-modified flag. Thus, when the DwHeaders object's is-modified flag is set, the DwMessage object -that is its tqparent will also have its is-modified flag set. That way, when +that is its parent will also have its is-modified flag set. That way, when Assemble() is called for the DwMessage object, it will call the Assemble() member function for the DwHeaders object, as required. Notice that the value of having an is-modified flag is that it can purge the tree traversal when diff --git a/mimelib/doc/address.html b/mimelib/doc/address.html index f7eb71faf..c85046aa7 100644 --- a/mimelib/doc/address.html +++ b/mimelib/doc/address.html @@ -128,16 +128,16 @@ DwAddress(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwAddress</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which copies the string -representation and all attributes from <B><TT>aAddress</TT></B>. The tqparent +representation and all attributes from <B><TT>aAddress</TT></B>. The parent of the new <B><TT>DwAddress</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwAddress</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -147,7 +147,7 @@ a class derived from <B><TT>DwField</TT></B>. (const DwAddress& aAddr) </FONT></B> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aAddr</TT></B>. The tqparent node of the <B><TT>DwAddress</TT></B> object +<B><TT>aAddr</TT></B>. The parent node of the <B><TT>DwAddress</TT></B> object is not changed. <P> </BODY></HTML> diff --git a/mimelib/doc/addrlist.html b/mimelib/doc/addrlist.html index 20a588d10..d3a563eef 100644 --- a/mimelib/doc/addrlist.html +++ b/mimelib/doc/addrlist.html @@ -69,16 +69,16 @@ DwAddressList(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwAddressList</TT></B> object's string representation to the empty -string and sets its tqparent to <B><TT>NULL</TT></B>. +string and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which copies the string representation and all <B><TT>DwAddress</TT></B> objects from -<B><TT>aList</TT></B>. The tqparent of the new +<B><TT>aList</TT></B>. The parent of the new <B><TT>DwAddressList</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwAddressList</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -88,7 +88,7 @@ a class derived from <B><TT>DwField</TT></B>. =</A> (const DwAddressList& aList) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aList</TT></B>. The tqparent node of the +<B><TT>aList</TT></B>. The parent node of the <B><TT>DwAddressList</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> diff --git a/mimelib/doc/body.html b/mimelib/doc/body.html index fb6c42c00..1526751a4 100644 --- a/mimelib/doc/body.html +++ b/mimelib/doc/body.html @@ -85,8 +85,8 @@ header field from the <P> In the tree (broken-down) representation of a message, a <B><TT>DwBody</TT></B> object can be an intermediate node, having both a -tqparent node and one or more child nodes, or a leaf node, having a tqparent -but no child nodes. In either case, the tqparent node is the +parent node and one or more child nodes, or a leaf node, having a parent +but no child nodes. In either case, the parent node is the <B><TT>DwEntity</TT></B> object that contains it. If it is an intermediate node, it must be of type multipart with <B><TT>DwBodyPart</TT></B> objects as child nodes, or of type message with a single @@ -117,15 +117,15 @@ DwBody(const DwString& aStr, DwMessageComponent* aParent=0) </B></FONT> <P> The first constructor is the default constructor, which sets the <B><TT>DwBody</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aBody</TT></B>. The tqparent of the new <B><TT>DwBody</TT></B> object +of <B><TT>aBody</TT></B>. The parent of the new <B><TT>DwBody</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwBody</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -135,7 +135,7 @@ a class derived from <B><TT>DwEntity</TT></B>. DwBody& aBody) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aBody</TT></B>. The tqparent node of the <B><TT>DwBody</TT></B> object +<B><TT>aBody</TT></B>. The parent node of the <B><TT>DwBody</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> @@ -150,7 +150,7 @@ collection of <B><TT>DwBodyPart</TT></B> objects. For a message <B><TT>DwBody</TT></B>, the parse method does nothing. This member function calls the <B><TT>Parse()</TT></B> member function of any objects it creates. <P> -Note: If the <B><TT>DwBody</TT></B> object has no tqparent node -- that is, +Note: If the <B><TT>DwBody</TT></B> object has no parent node -- that is, it is not contained by a <B><TT>DwEntity</TT></B> object -- then the parse method does nothing, since it is unable to determine the type of body. <P> diff --git a/mimelib/doc/bodypart.html b/mimelib/doc/bodypart.html index 93f281b5d..6a3a29b6e 100644 --- a/mimelib/doc/bodypart.html +++ b/mimelib/doc/bodypart.html @@ -66,15 +66,15 @@ DwBodyPart(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwBodyPart</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aPart</TT></B>. The tqparent of the new +of <B><TT>aPart</TT></B>. The parent of the new <B><TT>DwBodyPart</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwBodyPart</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -84,7 +84,7 @@ a class derived from <B><TT>DwBody</TT></B>. (const DwBodyPart& aPart) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aPart</TT></B>. The tqparent node of the <B><TT>DwBodyPart</TT></B> +<B><TT>aPart</TT></B>. The parent node of the <B><TT>DwBodyPart</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual DwMessageComponent* diff --git a/mimelib/doc/datetime.html b/mimelib/doc/datetime.html index 8461b260e..0516d9292 100644 --- a/mimelib/doc/datetime.html +++ b/mimelib/doc/datetime.html @@ -94,12 +94,12 @@ DwDateTime(const DwString& aStr, DwMessageComponent* aParent=0) The first constructor is the default constructor, which assigns the current date and time as reported by the operating system. <P> -The second constructor is the copy constructor. The tqparent of the new +The second constructor is the copy constructor. The parent of the new <B><TT>DwDateTime</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor sets <B><TT>aStr</TT></B> as the <B><TT>DwDateTime</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called after this constructor to extract the date and time information from the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -130,7 +130,7 @@ This virtual function, inherited from <B><TT>DwMessageComponent</TT></B>, executes the assemble method for <B><TT>DwDateTime</TT></B> objects. It should be called whenever one of the object's attributes is changed in order to assemble the string representation from its broken-down representation. It -will be called automatically for this object by the tqparent object's +will be called automatically for this object by the parent object's <B><TT>Assemble()</TT></B> member function if the is-modified flag is set. <P> This function clears the is-modified flag. diff --git a/mimelib/doc/disptype.html b/mimelib/doc/disptype.html index 9d6c71a52..c64b1dc13 100644 --- a/mimelib/doc/disptype.html +++ b/mimelib/doc/disptype.html @@ -90,15 +90,15 @@ DwDispositionType(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwDispositionType</TT></B> object's string representation to the empty -string and sets its tqparent to <B><TT>NULL</TT></B>. +string and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs deep copy -of <B><TT>aDispType</TT></B>. The tqparent of the new +of <B><TT>aDispType</TT></B>. The parent of the new <B><TT>DwDispositionType</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwDispositionType</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -108,7 +108,7 @@ a class derived from <B><TT>DwField</TT></B>. =</A> (const DwDispositionType& aDispType) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aDispType</TT></B>. The tqparent node of the +<B><TT>aDispType</TT></B>. The parent node of the <B><TT>DwDipositionType</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> @@ -127,7 +127,7 @@ This virtual function, inherited from <B><TT>DwMessageComponent</TT></B>, executes the assemble method for <B><TT>DwDispositionType</TT></B> objects. It should be called whenever one of the object's attributes is changed in order to assemble the string representation from its broken-down representation. -It will be called automatically for this object by the tqparent object's +It will be called automatically for this object by the parent object's <B><TT>Assemble()</TT></B> member function if the is-modified flag is set. <P> This function clears the is-modified flag. diff --git a/mimelib/doc/entity.html b/mimelib/doc/entity.html index 64a1cdbff..08cf8b753 100644 --- a/mimelib/doc/entity.html +++ b/mimelib/doc/entity.html @@ -52,10 +52,10 @@ and a <B><TT><A HREF="body.html">DwBody</A></TT></B> object. <P> In the tree (broken-down) representation of message, a <B><TT>DwEntity</TT></B> object may be either a root node, having child nodes -but no tqparent node, or an intermediate node, having both a tqparent node and +but no parent node, or an intermediate node, having both a parent node and child nodes. A <B><TT>DwEntity</TT></B> object that is a root node must also be a <B><TT><A HREF="message.html">DwMessage</A></TT></B> object. If a -<B><TT>DwEntity</TT></B> object is an intermediate node, its tqparent must +<B><TT>DwEntity</TT></B> object is an intermediate node, its parent must be a <B><TT>DwBody</TT></B> object. The child nodes of a <B><TT>DwEntity</TT></B> object are the <B><TT>DwHeaders</TT></B> and <B><TT>DwBody</TT></B> objects it contains. @@ -80,15 +80,15 @@ DwEntity(const DwString& aStr, DwMessageComponent* aParent=0) </B></FONT> <P> The first constructor is the default constructor, which sets the <B><TT>DwEntity</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aEntity</TT></B>. The tqparent of the new +of <B><TT>aEntity</TT></B>. The parent of the new <B><TT>DwEntity</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwEntity</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -98,7 +98,7 @@ a class derived from <B><TT>DwBody</TT></B>. (const DwEntity& aEntity) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aEntity</TT></B>. The tqparent node of the <B><TT>DwEntity</TT></B> +<B><TT>aEntity</TT></B>. The parent node of the <B><TT>DwEntity</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> diff --git a/mimelib/doc/field.html b/mimelib/doc/field.html index c744877c4..19736f271 100644 --- a/mimelib/doc/field.html +++ b/mimelib/doc/field.html @@ -73,8 +73,8 @@ name, a <B><TT>DwString</TT></B> that contains its field body, and a a broken-down (that is, parsed) version of its field body. <P> In the tree (broken-down) representation of message, a -<B><TT>DwField</TT></B> object is always an intermediate node, having a tqparent -node and a single child node. The tqparent node is the +<B><TT>DwField</TT></B> object is always an intermediate node, having a parent +node and a single child node. The parent node is the <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object that contains it. The child node is the <B><TT>DwFieldBody</TT></B> object it contains. <P> @@ -87,7 +87,7 @@ get and set the <B><TT>DwFieldBody</TT></B> object, use <P> A <B><TT>DwField</TT></B> object can be included in a list of <B><TT>DwField</TT></B> objects; usually this is the list of -<B><TT>DwField</TT></B> objects maintained by its tqparent +<B><TT>DwField</TT></B> objects maintained by its parent <B><TT>DwHeaders</TT></B> object. To get the next <B><TT>DwField</TT></B> object in a list, use the member function <B><TT>Next()</TT></B>. <H2> @@ -100,16 +100,16 @@ DwField(const DwString& aStr, DwMessageComponent* aParent=0) </B></FONT> <P> The first constructor is the default constructor, which sets the <B><TT>DwField</TT></B> object's field name and field body to the empty string, -set its tqparent to <B><TT>NULL</TT></B>, and sets its +set its parent to <B><TT>NULL</TT></B>, and sets its <B><TT>DwFieldBody</TT></B> object to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aField</TT></B>. The tqparent of the new <B><TT>DwField</TT></B> +of <B><TT>aField</TT></B>. The parent of the new <B><TT>DwField</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwField</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -119,7 +119,7 @@ a class derived from <B><TT>DwHeaders</TT></B>. (const DwField& aField) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aField</TT></B>. The tqparent node of the <B><TT>DwField</TT></B> object +<B><TT>aField</TT></B>. The parent node of the <B><TT>DwField</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> diff --git a/mimelib/doc/fieldbdy.html b/mimelib/doc/fieldbdy.html index 1da30ab54..856fd5330 100644 --- a/mimelib/doc/fieldbdy.html +++ b/mimelib/doc/fieldbdy.html @@ -50,9 +50,9 @@ grammar specified by RFC-822. It is an abstract base class that defines the interface common to all structured field bodies. <P> In the tree (broken-down) representation of a message, a -<B><TT>DwFieldBody</TT></B> object may be either a leaf node, having a tqparent -but no child nodes, or an intermediate node, having a tqparent and one or more -child nodes. The tqparent node is the +<B><TT>DwFieldBody</TT></B> object may be either a leaf node, having a parent +but no child nodes, or an intermediate node, having a parent and one or more +child nodes. The parent node is the <B><TT><A HREF="field.html">DwField</A></TT></B> object that contains it. Child nodes, if present, depend on the particular subclass of <B><TT>DwFieldBody</TT></B> that is instantiated. A @@ -80,15 +80,15 @@ DwFieldBody(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwFieldBody</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aFieldBody</TT></B>. The tqparent of the new +of <B><TT>aFieldBody</TT></B>. The parent of the new <B><TT>DwFieldBody</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwFieldBody</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -98,7 +98,7 @@ a class derived from <B><TT>DwField</TT></B>. (const DwFieldBody& aFieldBody) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aFieldBody</TT></B>. The tqparent node of the +<B><TT>aFieldBody</TT></B>. The parent node of the <B><TT>DwFieldBody</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> void <A NAME="SetOffset">SetOffset</A>(int aOffset) diff --git a/mimelib/doc/group.html b/mimelib/doc/group.html index 27c8397eb..1d374d874 100644 --- a/mimelib/doc/group.html +++ b/mimelib/doc/group.html @@ -59,7 +59,7 @@ list of mailboxes. <P> In the tree (broken-down) representation of message, a <B><TT>DwGroup</TT></B> object may be only an intermediate node, having both -a tqparent and a single child node. Its tqparent node must be a +a parent and a single child node. Its parent node must be a <B><TT><A HREF="field.html">DwField</A></TT></B> or a <B><TT><A HREF="addrlist.html">DwAddressList</A></TT></B>. Its child is a <B><TT>DwMailboxList</TT></B>. @@ -79,15 +79,15 @@ DwGroup(const DwString& aStr, DwMessageComponent* aParent=0) </B></FONT> <P> The first constructor is the default constructor, which sets the <B><TT>DwGroup</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aGroup</TT></B>. The tqparent of the new <B><TT>DwGroup</TT></B> +of <B><TT>aGroup</TT></B>. The parent of the new <B><TT>DwGroup</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwGroup</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -98,7 +98,7 @@ a class derived from <B><TT>DwField</TT></B> or (const DwGroup& aGroup) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aGroup</TT></B>. The tqparent node of the <B><TT>DwGroup</TT></B> object +<B><TT>aGroup</TT></B>. The parent node of the <B><TT>DwGroup</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> diff --git a/mimelib/doc/headers.html b/mimelib/doc/headers.html index 939b340ee..8bf94ad98 100644 --- a/mimelib/doc/headers.html +++ b/mimelib/doc/headers.html @@ -153,8 +153,8 @@ or body part), as described in RFC-822 and RFC-2045. A the individual header fields. <P> In the tree (broken-down) representation of a message, a -<B><TT>DwHeaders</TT></B> object is an intermediate node, having both a tqparent -node and several child nodes. The tqparent node is the +<B><TT>DwHeaders</TT></B> object is an intermediate node, having both a parent +node and several child nodes. The parent node is the <B><TT><A HREF="entity.html">DwEntity</A></TT></B> object that contains it. The child nodes are the <B><TT>DwField</TT></B> objects in the list it manages. (See the man page for @@ -208,15 +208,15 @@ DwHeaders(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwHeaders</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aHeaders</TT></B>. The tqparent of the new +of <B><TT>aHeaders</TT></B>. The parent of the new <B><TT>DwHeaders</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwHeaders</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -226,7 +226,7 @@ a class derived from <B><TT>DwEntity</TT></B>. (const DwHeaders& aHeaders) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aHeaders</TT></B>. The tqparent node of the +<B><TT>aHeaders</TT></B>. The parent node of the <B><TT>DwHeaders</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> diff --git a/mimelib/doc/mailbox.html b/mimelib/doc/mailbox.html index 385bd8a23..492070ccb 100644 --- a/mimelib/doc/mailbox.html +++ b/mimelib/doc/mailbox.html @@ -70,8 +70,8 @@ fact that a mailbox is also an address. A <B><TT>DwMailbox</TT></B> contains strings representing the full name, local-part, route, and domain of a mailbox. <P> In the tree (broken-down) representation of message, a -<B><TT>DwMailbox</TT></B> object may be only a leaf node, having a tqparent -but no child nodes. Its tqparent node must be a +<B><TT>DwMailbox</TT></B> object may be only a leaf node, having a parent +but no child nodes. Its parent node must be a <B><TT><A HREF="field.html">DwField</A></TT></B>, a <B><TT><A HREF="addrlist.html">DwAddressList</A></TT></B>, or a <B><TT><A HREF="mboxlist.html">DwMailboxList</A></TT></B> object. @@ -94,15 +94,15 @@ DwMailbox(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwMailbox</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aMailbox</TT></B>. The tqparent of the new +of <B><TT>aMailbox</TT></B>. The parent of the new <B><TT>DwMailbox</TT></B> is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwMailbox</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -112,7 +112,7 @@ a class derived from <B><TT>DwField</TT></B>. (const DwMailbox& aMailbox) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aMailbox</TT></B>. The tqparent node of the +<B><TT>aMailbox</TT></B>. The parent node of the <B><TT>DwMailbox</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> diff --git a/mimelib/doc/mboxlist.html b/mimelib/doc/mboxlist.html index 2bbe8d95e..2bae2b4e3 100644 --- a/mimelib/doc/mboxlist.html +++ b/mimelib/doc/mboxlist.html @@ -71,16 +71,16 @@ DwMailboxList(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwMailboxList</TT></B> object's string representation to the empty -string and sets its tqparent to <B><TT>NULL</TT></B>. +string and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which copies the string representation and all <B><TT>DwMailbox</TT></B> objects from -<B><TT>aList</TT></B>. The tqparent of the new +<B><TT>aList</TT></B>. The parent of the new <B><TT>DwMailboxList</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwMailboxList</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -90,7 +90,7 @@ a class derived from <B><TT>DwField</TT></B>. =</A> (const DwMailboxList& aList) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aList</TT></B>. The tqparent node of the +<B><TT>aList</TT></B>. The parent node of the <B><TT>DwMailboxList</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> diff --git a/mimelib/doc/mechansm.html b/mimelib/doc/mechansm.html index 9e5f525fb..9880b5fa2 100644 --- a/mimelib/doc/mechansm.html +++ b/mimelib/doc/mechansm.html @@ -59,15 +59,15 @@ DwMechanism(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwMechanism</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which copies the string -representation from <B><TT>aCte</TT></B>. The tqparent of the new +representation from <B><TT>aCte</TT></B>. The parent of the new <B><TT>DwMechanism</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwMechanism</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -77,7 +77,7 @@ a class derived from <B><TT>DwField</TT></B>. (const DwMechanism& aCte) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aCte</TT></B>. The tqparent node of the <B><TT>DwMechanism</TT></B> +<B><TT>aCte</TT></B>. The parent node of the <B><TT>DwMechanism</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> @@ -96,7 +96,7 @@ This virtual function, inherited from <B><TT>DwMessageComponent</TT></B>, executes the assemble method for <B><TT>DwMechanism</TT></B> objects. It should be called whenever one of the object's attributes is changed in order to assemble the string representation. It will be called automatically for -this object by the tqparent object's <B><TT>Assemble()</TT></B> member function +this object by the parent object's <B><TT>Assemble()</TT></B> member function if the is-modified flag is set. <P> This function clears the is-modified flag. diff --git a/mimelib/doc/mediatyp.html b/mimelib/doc/mediatyp.html index e603a2699..01696084b 100644 --- a/mimelib/doc/mediatyp.html +++ b/mimelib/doc/mediatyp.html @@ -107,15 +107,15 @@ DwMediaType(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwMediaType</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs deep copy -of <B><TT>aMediaType</TT></B>. The tqparent of the new +of <B><TT>aMediaType</TT></B>. The parent of the new <B><TT>DwMediaType</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwMediaType</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is <B><TT>NULL</TT></B>, <B><TT>aParent</TT></B> should point to an object of @@ -125,7 +125,7 @@ a class derived from <B><TT>DwField</TT></B>. (const DwMediaType& aMediaType) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aMediaType</TT></B>. The tqparent node of the +<B><TT>aMediaType</TT></B>. The parent node of the <B><TT>DwMediaType</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> @@ -144,7 +144,7 @@ This virtual function, inherited from <B><TT>DwMessageComponent</TT></B>, executes the assemble method for <B><TT>DwMediaType</TT></B> objects. It should be called whenever one of the object's attributes is changed in order to assemble the string representation from its broken-down representation. -It will be called automatically for this object by the tqparent object's +It will be called automatically for this object by the parent object's <B><TT>Assemble()</TT></B> member function if the is-modified flag is set. <P> This function clears the is-modified flag. diff --git a/mimelib/doc/message.html b/mimelib/doc/message.html index bb3fcf220..d08d5af4e 100644 --- a/mimelib/doc/message.html +++ b/mimelib/doc/message.html @@ -50,10 +50,10 @@ both a <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object and a <P> In the tree (broken-down) representation of message, a <B><TT>DwMessage</TT></B> object is almost always a root node, having child -nodes but no tqparent node. The child nodes are the +nodes but no parent node. The child nodes are the <B><TT>DwHeaders</TT></B> object and the <B><TT>DwBody</TT></B> object it contains. A <B><TT>DwMessage</TT></B> may sometimes be an intermediate node. -In this special case, the tqparent node is a <B><TT>DwBody</TT></B> object +In this special case, the parent node is a <B><TT>DwBody</TT></B> object of type "message/*" and the <B><TT>DwMessage</TT></B> object represents an encapsulated message. <P> @@ -72,15 +72,15 @@ DwMessage(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwMessage</TT></B> object's string representation to the empty string -and sets its tqparent to <B><TT>NULL</TT></B>. +and sets its parent to <B><TT>NULL</TT></B>. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aMessage</TT></B>. The tqparent of the new +of <B><TT>aMessage</TT></B>. The parent of the new <B><TT>DwMessage</TT></B> object is set to <B><TT>NULL</TT></B>. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwMessage</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. <P> @@ -88,7 +88,7 @@ in order to parse the string representation. (const DwMessage& aMessage) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aMessage</TT></B>. The tqparent node of the +<B><TT>aMessage</TT></B>. The parent node of the <B><TT>DwMessage</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual DwMessageComponent* diff --git a/mimelib/doc/msgcmp.html b/mimelib/doc/msgcmp.html index 4eae39937..2e8a3da77 100644 --- a/mimelib/doc/msgcmp.html +++ b/mimelib/doc/msgcmp.html @@ -130,19 +130,19 @@ These features are the following: <B><TT>SetModified()</TT></B> which forces the is-modified flag to be set. <P> <LI> - A tqparent. Most message components are part of another component. A collection + A parent. Most message components are part of another component. A collection of headers is part of a message or body part, a header field is part of a collection of headers, a field-body is part of a header field, and so on. - The tqparent of a component is the component that contains it. This tree structure - is important, since a component's tqparent must be parsed before the component + The parent of a component is the component that contains it. This tree structure + is important, since a component's parent must be parsed before the component can be. Also, a component's string representation must be assembled before - its tqparent's. To maintain consistency in the tree, whenever a component's - is-modified flag is set, the component notifies its tqparent to also set its + its parent's. To maintain consistency in the tree, whenever a component's + is-modified flag is set, the component notifies its parent to also set its is-modified flag. In this way, an is-modified flag set anywhere in the tree always propagates up to the root component. <P> <LI> - Children. The preceding discussion about a component's tqparent is relevant + Children. The preceding discussion about a component's parent is relevant to an understanding of a component's tqchildren. A component's parse method calls the parse methods of its tqchildren after it has executed its own parse method (and, in some cases, created all of its tqchildren). Also, a component @@ -163,15 +163,15 @@ DwMessageComponent(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwMessageComponent</TT></B> object's string representation to the -empty string and sets its tqparent to NULL. +empty string and sets its parent to NULL. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aCmp</TT></B>. The tqparent of the new +of <B><TT>aCmp</TT></B>. The parent of the new <B><TT>DwMessageComponent</TT></B> object is set to NULL. <P> The third constructor copies <B><TT>aStr</TT></B> to the new <B><TT>DwMessageComponent</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. In typical cases, the virtual member +<B><TT>aParent</TT></B> as its parent. In typical cases, the virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor to parse the new <B><TT>DwMessageComponent</TT></B> object and all of its tqchildren into their broken-down representations. @@ -241,14 +241,14 @@ string representation are consistent. See also <FONT COLOR="teal"><B> DwMessageComponent* <A NAME="Parent">Parent</A>() </B></FONT> <P> -Returns the <B><TT>DwMessageComponent</TT></B> object that is the tqparent +Returns the <B><TT>DwMessageComponent</TT></B> object that is the parent of this object. <P> <FONT COLOR="teal"><B> void <A NAME="SetParent">SetParent</A>(DwMessageComponent* aParent) </B></FONT> <P> Sets <B><TT>aParent</TT></B> as the <B><TT>DwMessageComponent</TT></B> object's -tqparent. +parent. <P> <FONT COLOR="teal"><B> DwBool <A NAME="IsModified">IsModified</A>() const </B></FONT> @@ -260,7 +260,7 @@ Returns 1 if the is-modified flag is set for this </B></FONT> <P> Sets the is-modified (dirty) flag for this -<B><TT>DwMessageComponent</TT></B> object and notifies the object's tqparent +<B><TT>DwMessageComponent</TT></B> object and notifies the object's parent to also set its is-modified flag. <P> <FONT COLOR="teal"><B> int <A NAME="ClassId">ClassId</A>() const </B></FONT> diff --git a/mimelib/doc/msgid.html b/mimelib/doc/msgid.html index 0f5b7c365..69d10ef59 100644 --- a/mimelib/doc/msgid.html +++ b/mimelib/doc/msgid.html @@ -53,8 +53,8 @@ In the BNF grammar in RFC-822, a msg-id has a <I>local-part</I> and a contain the local-part and the domain. <P> In the tree (broken-down) representation of message, a -<B><TT>DwMsgId</TT></B> object may only be a leaf node, having a tqparent but -no child nodes. Its tqparent node must be a +<B><TT>DwMsgId</TT></B> object may only be a leaf node, having a parent but +no child nodes. Its parent node must be a <A HREF="field.html"><B><TT>DwField</TT></B> </A>object. <P> <B><TT>DwMsgId</TT></B> has member functions for getting or setting its @@ -71,15 +71,15 @@ DwMsgId(const DwString& aStr, DwMessageComponent* aParent=0) </B></FONT> <P> The first constructor is the default constructor, which sets the <B><TT>DwMsgId</TT></B> object's string representation to the empty string -and sets its tqparent to NULL. +and sets its parent to NULL. <P> The second constructor is the copy constructor, which performs a deep copy -of <B><TT>aMsgId</TT></B>. The tqparent of the new <B><TT>DwMsgId</TT></B> +of <B><TT>aMsgId</TT></B>. The parent of the new <B><TT>DwMsgId</TT></B> object is set to NULL. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwMsgId</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is NULL, <B><TT>aParent</TT></B> should point to an object of a class derived from @@ -89,7 +89,7 @@ in order to parse the string representation. Unless it is NULL, (const DwMsgId& aMsgId) </B></FONT> <P> This is the assignment operator, which performs a deep copy of -<B><TT>aMsgId</TT></B>. The tqparent node of the <B><TT>DwMsgId</TT></B> object +<B><TT>aMsgId</TT></B>. The parent node of the <B><TT>DwMsgId</TT></B> object is not changed. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Parse">Parse</A>() </B></FONT> diff --git a/mimelib/doc/param.html b/mimelib/doc/param.html index 3ca10ee8f..786f65bc5 100644 --- a/mimelib/doc/param.html +++ b/mimelib/doc/param.html @@ -69,15 +69,15 @@ DwParameter(const DwString& aStr, DwMessageComponent* aParent=0) <P> The first constructor is the default constructor, which sets the <B><TT>DwParameter</TT></B> object's string representation to the empty string -and sets its tqparent to NULL. +and sets its parent to NULL. <P> The second constructor is the copy constructor, which copies the string -representation, attribute, and value from <B><TT>aParam</TT></B>. The tqparent +representation, attribute, and value from <B><TT>aParam</TT></B>. The parent of the new <B><TT>DwParameter</TT></B> object is set to NULL. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwParameter</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is NULL, <B><TT>aParent</TT></B> should point to an object of a class derived from @@ -102,7 +102,7 @@ This virtual function, inherited from <B><TT>DwMessageComponent</TT></B>, executes the assemble method for <B><TT>DwParameter</TT></B> objects. It should be called whenever one of the object's attributes is changed in order to assemble the string representation from its broken-down representation. -It will be called automatically for this object by the tqparent object's +It will be called automatically for this object by the parent object's <B><TT>Assemble()</TT></B> member function if the is-modified flag is set. <P> <FONT COLOR="teal"><B> virtual DwMessageComponent* diff --git a/mimelib/doc/text.html b/mimelib/doc/text.html index 4a32ce305..3fc637cac 100644 --- a/mimelib/doc/text.html +++ b/mimelib/doc/text.html @@ -53,15 +53,15 @@ DwText(const DwString& aStr, DwMessageComponent* aParent=0) </B></FONT> <P> The first constructor is the default constructor, which sets the <B><TT>DwText</TT></B> object's string representation to the empty string -and sets its tqparent to NULL. +and sets its parent to NULL. <P> The second constructor is the copy constructor, which copies the string -representation from <B><TT>aText</TT></B>. The tqparent of the new +representation from <B><TT>aText</TT></B>. The parent of the new <B><TT>DwText</TT></B> object is set to NULL. <P> The third constructor copies <B><TT>aStr</TT></B> to the <B><TT>DwText</TT></B> object's string representation and sets -<B><TT>aParent</TT></B> as its tqparent. The virtual member function +<B><TT>aParent</TT></B> as its parent. The virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor in order to parse the string representation. Unless it is NULL, <B><TT>aParent</TT></B> should point to an object of a class derived from diff --git a/mimelib/mimelib/address.h b/mimelib/mimelib/address.h index dbd657bab..f4ec3a7d2 100644 --- a/mimelib/mimelib/address.h +++ b/mimelib/mimelib/address.h @@ -96,14 +96,14 @@ protected: DwAddress(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwAddress} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which copies the //. string representation and all attributes from {\tt aAddress}. - //. The tqparent of the new {\tt DwAddress} object is set to {\tt NULL}. + //. The parent of the new {\tt DwAddress} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwAddress} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -111,7 +111,7 @@ protected: const DwAddress& operator = (const DwAddress& aAddr); //. This is the assignment operator, which performs a deep copy of - //. {\tt aAddr}. The tqparent node of the {\tt DwAddress} object + //. {\tt aAddr}. The parent node of the {\tt DwAddress} object //. is not changed. int mIsValid; diff --git a/mimelib/mimelib/addrlist.h b/mimelib/mimelib/addrlist.h index c02e38977..5db647256 100644 --- a/mimelib/mimelib/addrlist.h +++ b/mimelib/mimelib/addrlist.h @@ -51,14 +51,14 @@ public: DwAddressList(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwAddressList} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which copies the //. string representation and all {\tt DwAddress} objects from {\tt aList}. - //. The tqparent of the new {\tt DwAddressList} object is set to {\tt NULL}. + //. The parent of the new {\tt DwAddressList} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwAddressList} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -68,7 +68,7 @@ public: const DwAddressList& operator = (const DwAddressList& aList); //. This is the assignment operator, which performs a deep copy of - //. {\tt aList}. The tqparent node of the {\tt DwAddressList} object + //. {\tt aList}. The parent node of the {\tt DwAddressList} object //. is not changed. virtual void Parse(); diff --git a/mimelib/mimelib/body.h b/mimelib/mimelib/body.h index 129c19dc0..654812d45 100644 --- a/mimelib/mimelib/body.h +++ b/mimelib/mimelib/body.h @@ -60,9 +60,9 @@ class DwBodyPart; //. should always be part of a {\tt DwEntity}. //. //. In the tree (broken-down) representation of a message, a {\tt DwBody} -//. object can be an intermediate node, having both a tqparent node and -//. one or more child nodes, or a leaf node, having a tqparent but no child -//. nodes. In either case, the tqparent node is the {\tt DwEntity} object +//. object can be an intermediate node, having both a parent node and +//. one or more child nodes, or a leaf node, having a parent but no child +//. nodes. In either case, the parent node is the {\tt DwEntity} object //. that contains it. If it is an intermediate node, it must be of type //. multipart with {\tt DwBodyPart} objects as child nodes, or of type //. message with a single {\tt DwMessage} object as its child node. @@ -96,14 +96,14 @@ public: DwBody(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwBody} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs //. a deep copy of {\tt aBody}. - //. The tqparent of the new {\tt DwBody} object is set to {\tt NULL}. + //. The parent of the new {\tt DwBody} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwBody} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -113,7 +113,7 @@ public: const DwBody& operator = (const DwBody& aBody); //. This is the assignment operator, which performs a deep copy of - //. {\tt aBody}. The tqparent node of the {\tt DwBody} object + //. {\tt aBody}. The parent node of the {\tt DwBody} object //. is not changed. virtual void Parse(); @@ -127,7 +127,7 @@ public: //. the parse method does nothing. This member function calls the //. {\tt Parse()} member function of any objects it creates. //. - //. Note: If the {\tt DwBody} object has no tqparent node -- that is, + //. Note: If the {\tt DwBody} object has no parent node -- that is, //. it is not contained by a {\tt DwEntity} object -- then the parse //. method does nothing, since it is unable to determine the type of //. body. diff --git a/mimelib/mimelib/bodypart.h b/mimelib/mimelib/bodypart.h index 7a9b32758..d2cda16e1 100644 --- a/mimelib/mimelib/bodypart.h +++ b/mimelib/mimelib/bodypart.h @@ -69,14 +69,14 @@ public: DwBodyPart(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwBodyPart} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs //. a deep copy of {\tt aPart}. - //. The tqparent of the new {\tt DwBodyPart} object is set to {\tt NULL}. + //. The parent of the new {\tt DwBodyPart} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwBodyPart} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -86,7 +86,7 @@ public: const DwBodyPart& operator = (const DwBodyPart& aPart); //. This is the assignment operator, which performs a deep copy of - //. {\tt aPart}. The tqparent node of the {\tt DwBodyPart} object + //. {\tt aPart}. The parent node of the {\tt DwBodyPart} object //. is not changed. virtual DwMessageComponent* Clone() const; diff --git a/mimelib/mimelib/datetime.h b/mimelib/mimelib/datetime.h index ef888d576..da7f62597 100644 --- a/mimelib/mimelib/datetime.h +++ b/mimelib/mimelib/datetime.h @@ -57,11 +57,11 @@ public: //. The first constructor is the default constructor, which assigns //. the current date and time as reported by the operating system. //. - //. The second constructor is the copy constructor. The tqparent of + //. The second constructor is the copy constructor. The parent of //. the new {\tt DwDateTime} object is set to {\tt NULL}. //. //. The third constructor sets {\tt aStr} as the {\tt DwDateTime} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called after //. this constructor to extract the date and time information from the //. string representation. Unless it is {\tt NULL}, {\tt aParent} should @@ -89,7 +89,7 @@ public: //. It should be called whenever one of the object's attributes //. is changed in order to assemble the string representation from //. its broken-down representation. It will be called - //. automatically for this object by the tqparent object's + //. automatically for this object by the parent object's //. {\tt Assemble()} member function if the is-modified flag is set. //. //. This function clears the is-modified flag. diff --git a/mimelib/mimelib/disptype.h b/mimelib/mimelib/disptype.h index ad12e8c41..e1e90b3b3 100644 --- a/mimelib/mimelib/disptype.h +++ b/mimelib/mimelib/disptype.h @@ -73,15 +73,15 @@ public: DwDispositionType(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwDispositionType} object's string representation to the empty - //. string and sets its tqparent to {\tt NULL}. + //. string and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs //. deep copy of {\tt aDispType}. - //. The tqparent of the new {\tt DwDispositionType} object is set to + //. The parent of the new {\tt DwDispositionType} object is set to //. {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwDispositionType} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -91,7 +91,7 @@ public: const DwDispositionType& operator = (const DwDispositionType& aDispType); //. This is the assignment operator, which performs a deep copy of - //. {\tt aDispType}. The tqparent node of the {\tt DwDipositionType} + //. {\tt aDispType}. The parent node of the {\tt DwDipositionType} //. object is not changed. virtual void Parse(); @@ -109,7 +109,7 @@ public: //. It should be called whenever one of the object's attributes //. is changed in order to assemble the string representation from //. its broken-down representation. It will be called - //. automatically for this object by the tqparent object's + //. automatically for this object by the parent object's //. {\tt Assemble()} member function if the is-modified flag is set. //. //. This function clears the is-modified flag. diff --git a/mimelib/mimelib/entity.h b/mimelib/mimelib/entity.h index 1f2c3f6db..e555f6ad1 100644 --- a/mimelib/mimelib/entity.h +++ b/mimelib/mimelib/entity.h @@ -48,10 +48,10 @@ class DwBody; //. a {\tt DwBody} object. //. //. In the tree (broken-down) representation of message, a {\tt DwEntity} -//. object may be either a root node, having child nodes but no tqparent -//. node, or an intermediate node, having both a tqparent node and child nodes. +//. object may be either a root node, having child nodes but no parent +//. node, or an intermediate node, having both a parent node and child nodes. //. A {\tt DwEntity} object that is a root node must also be a {\tt DwMessage} -//. object. If a {\tt DwEntity} object is an intermediate node, its tqparent +//. object. If a {\tt DwEntity} object is an intermediate node, its parent //. must be a {\tt DwBody} object. The child nodes of a {\tt DwEntity} //. object are the {\tt DwHeaders} and {\tt DwBody} objects it contains. //. @@ -75,14 +75,14 @@ public: DwEntity(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwEntity} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs //. a deep copy of {\tt aEntity}. - //. The tqparent of the new {\tt DwEntity} object is set to {\tt NULL}. + //. The parent of the new {\tt DwEntity} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwEntity} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -92,7 +92,7 @@ public: const DwEntity& operator = (const DwEntity& aEntity); //. This is the assignment operator, which performs a deep copy of - //. {\tt aEntity}. The tqparent node of the {\tt DwEntity} object + //. {\tt aEntity}. The parent node of the {\tt DwEntity} object //. is not changed. virtual void Parse(); diff --git a/mimelib/mimelib/field.h b/mimelib/mimelib/field.h index eac95494d..f53c2b023 100644 --- a/mimelib/mimelib/field.h +++ b/mimelib/mimelib/field.h @@ -51,8 +51,8 @@ class DwFieldBody; //. (that is, parsed) version of its field body. //. //. In the tree (broken-down) representation of message, a {\tt DwField} -//. object is always an intermediate node, having a tqparent node and a single -//. child node. The tqparent node is the {\tt DwHeaders} object that contains +//. object is always an intermediate node, having a parent node and a single +//. child node. The parent node is the {\tt DwHeaders} object that contains //. it. The child node is the {\tt DwFieldBody} object it contains. //. //. To get and set the field name, use the member functions @@ -64,7 +64,7 @@ class DwFieldBody; //. //. A {\tt DwField} object can be included in a list of {\tt DwField} //. objects; usually this is the list of {\tt DwField} objects maintained -//. by its tqparent {\tt DwHeaders} object. To get the next {\tt DwField} +//. by its parent {\tt DwHeaders} object. To get the next {\tt DwField} //. object in a list, use the member function {\tt Next()}. //============================================================================= // Last updated 1997-08-23 @@ -82,15 +82,15 @@ public: DwField(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwField} object's field name and field body to the empty - //. string, set its tqparent to {\tt NULL}, and sets its {\tt DwFieldBody} + //. string, set its parent to {\tt NULL}, and sets its {\tt DwFieldBody} //. object to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs //. a deep copy of {\tt aField}. - //. The tqparent of the new {\tt DwField} object is set to {\tt NULL}. + //. The parent of the new {\tt DwField} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwField} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -100,7 +100,7 @@ public: const DwField& operator = (const DwField& aField); //. This is the assignment operator, which performs a deep copy of - //. {\tt aField}. The tqparent node of the {\tt DwField} object + //. {\tt aField}. The parent node of the {\tt DwField} object //. is not changed. virtual void Parse(); diff --git a/mimelib/mimelib/fieldbdy.h b/mimelib/mimelib/fieldbdy.h index 71a2164f6..229bc7bc5 100644 --- a/mimelib/mimelib/fieldbdy.h +++ b/mimelib/mimelib/fieldbdy.h @@ -45,9 +45,9 @@ //. interface common to all structured field bodies. //. //. In the tree (broken-down) representation of a message, a {\tt DwFieldBody} -//. object may be either a leaf node, having a tqparent but no child nodes, or -//. an intermediate node, having a tqparent and one or more child nodes. The -//. tqparent node is the {\tt DwField} object that contains it. Child nodes, +//. object may be either a leaf node, having a parent but no child nodes, or +//. an intermediate node, having a parent and one or more child nodes. The +//. parent node is the {\tt DwField} object that contains it. Child nodes, //. if present, depend on the particular subclass of {\tt DwFieldBody} that //. is instantiated. A {\tt DwAddressList} object, for example, has //. {\tt DwAddress} objects as its child nodes. @@ -78,14 +78,14 @@ public: DwFieldBody(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwFieldBody} object's string representation to the empty - //. string and sets its tqparent to {\tt NULL}. + //. string and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs a //. deep copy of {\tt aFieldBody}. - //. The tqparent of the new {\tt DwFieldBody} object is set to {\tt NULL}. + //. The parent of the new {\tt DwFieldBody} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwFieldBody} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -95,7 +95,7 @@ public: const DwFieldBody& operator = (const DwFieldBody& aFieldBody); //. This is the assignment operator, which performs a deep copy of - //. {\tt aFieldBody}. The tqparent node of the {\tt DwFieldBody} object + //. {\tt aFieldBody}. The parent node of the {\tt DwFieldBody} object //. is not changed. void SetOffset(int aOffset); diff --git a/mimelib/mimelib/group.h b/mimelib/mimelib/group.h index 06600af29..e823500f9 100644 --- a/mimelib/mimelib/group.h +++ b/mimelib/mimelib/group.h @@ -52,8 +52,8 @@ //. and a {\tt DwMailboxList} object for the list of mailboxes. //. //. In the tree (broken-down) representation of message, a {\tt DwGroup} -//. object may be only an intermediate node, having both a tqparent and a single -//. child node. Its tqparent node must be a {\tt DwField} or a +//. object may be only an intermediate node, having both a parent and a single +//. child node. Its parent node must be a {\tt DwField} or a //. {\tt DwAddressList}. Its child is a {\tt DwMailboxList}. //. //. A {\tt DwGroup} is a {\tt DwAddress}, and therefore it can be included @@ -74,14 +74,14 @@ public: DwGroup(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwGroup} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs //. a deep copy of {\tt aGroup}. - //. The tqparent of the new {\tt DwGroup} object is set to {\tt NULL}. + //. The parent of the new {\tt DwGroup} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwGroup} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -91,7 +91,7 @@ public: const DwGroup& operator = (const DwGroup& aGroup); //. This is the assignment operator, which performs a deep copy of - //. {\tt aGroup}. The tqparent node of the {\tt DwGroup} object + //. {\tt aGroup}. The parent node of the {\tt DwGroup} object //. is not changed. virtual void Parse(); diff --git a/mimelib/mimelib/headers.h b/mimelib/mimelib/headers.h index a2011776e..a34531bd8 100644 --- a/mimelib/mimelib/headers.h +++ b/mimelib/mimelib/headers.h @@ -86,8 +86,8 @@ class DwText; //. header fields. //. //. In the tree (broken-down) representation of a message, a {\tt DwHeaders} -//. object is an intermediate node, having both a tqparent node and several -//. child nodes. The tqparent node is the {\tt DwEntity} object that contains +//. object is an intermediate node, having both a parent node and several +//. child nodes. The parent node is the {\tt DwEntity} object that contains //. it. The child nodes are the {\tt DwField} objects in the list it manages. //. (See the man page for {\tt DwMessageComponent} for a discussion of //. the tree representation of a message.) @@ -138,14 +138,14 @@ public: DwHeaders(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwHeaders} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs a //. deep copy of {\tt aHeaders}. - //. The tqparent of the new {\tt DwHeaders} object is set to {\tt NULL}. + //. The parent of the new {\tt DwHeaders} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwHeaders} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of a class @@ -155,7 +155,7 @@ public: const DwHeaders& operator = (const DwHeaders& aHeaders); //. This is the assignment operator, which performs a deep copy of - //. {\tt aHeaders}. The tqparent node of the {\tt DwHeaders} object + //. {\tt aHeaders}. The parent node of the {\tt DwHeaders} object //. is not changed. virtual void Parse(); diff --git a/mimelib/mimelib/mailbox.h b/mimelib/mimelib/mailbox.h index f118e38ee..9c472c487 100644 --- a/mimelib/mimelib/mailbox.h +++ b/mimelib/mimelib/mailbox.h @@ -58,8 +58,8 @@ //. of a mailbox. //. //. In the tree (broken-down) representation of message, a {\tt DwMailbox} -//. object may be only a leaf node, having a tqparent but no child nodes. -//. Its tqparent node must be a {\tt DwField}, a {\tt DwAddressList}, or a +//. object may be only a leaf node, having a parent but no child nodes. +//. Its parent node must be a {\tt DwField}, a {\tt DwAddressList}, or a //. {\tt DwMailboxList} object. //. //. {\tt DwMailbox} has member functions for getting or setting the strings @@ -85,14 +85,14 @@ public: DwMailbox(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwMailbox} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs //. a deep copy of {\tt aMailbox}. - //. The tqparent of the new {\tt DwMailbox} is set to {\tt NULL}. + //. The parent of the new {\tt DwMailbox} is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwMailbox} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of a class @@ -102,7 +102,7 @@ public: const DwMailbox& operator = (const DwMailbox& aMailbox); //. This is the assignment operator, which performs a deep copy of - //. {\tt aMailbox}. The tqparent node of the {\tt DwMailbox} object + //. {\tt aMailbox}. The parent node of the {\tt DwMailbox} object //. is not changed. virtual void Parse(); diff --git a/mimelib/mimelib/mboxlist.h b/mimelib/mimelib/mboxlist.h index 8d6f59c97..3cfe1c6d6 100644 --- a/mimelib/mimelib/mboxlist.h +++ b/mimelib/mimelib/mboxlist.h @@ -60,14 +60,14 @@ public: DwMailboxList(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwMailboxList} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which copies the //. string representation and all {\tt DwMailbox} objects from {\tt aList}. - //. The tqparent of the new {\tt DwMailboxList} object is set to {\tt NULL}. + //. The parent of the new {\tt DwMailboxList} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwMailboxList} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -77,7 +77,7 @@ public: const DwMailboxList& operator = (const DwMailboxList& aList); //. This is the assignment operator, which performs a deep copy of - //. {\tt aList}. The tqparent node of the {\tt DwMailboxList} object + //. {\tt aList}. The parent node of the {\tt DwMailboxList} object //. is not changed. virtual void Parse(); diff --git a/mimelib/mimelib/mechansm.h b/mimelib/mimelib/mechansm.h index ace3c29bf..bb8f55e12 100644 --- a/mimelib/mimelib/mechansm.h +++ b/mimelib/mimelib/mechansm.h @@ -58,14 +58,14 @@ public: DwMechanism(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwMechanism} object's string representation to the empty - //. string and sets its tqparent to {\tt NULL}. + //. string and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which copies the //. string representation from {\tt aCte}. - //. The tqparent of the new {\tt DwMechanism} object is set to {\tt NULL}. + //. The parent of the new {\tt DwMechanism} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwMechanism} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -75,7 +75,7 @@ public: const DwMechanism& operator = (const DwMechanism& aCte); //. This is the assignment operator, which performs a deep copy of - //. {\tt aCte}. The tqparent node of the {\tt DwMechanism} object + //. {\tt aCte}. The parent node of the {\tt DwMechanism} object //. is not changed. virtual void Parse(); @@ -91,7 +91,7 @@ public: //. executes the assemble method for {\tt DwMechanism} objects. //. It should be called whenever one of the object's attributes //. is changed in order to assemble the string representation. - //. It will be called automatically for this object by the tqparent + //. It will be called automatically for this object by the parent //. object's {\tt Assemble()} member function if the is-modified //. flag is set. //. diff --git a/mimelib/mimelib/mediatyp.h b/mimelib/mimelib/mediatyp.h index 6484f1e3e..02ec6e135 100644 --- a/mimelib/mimelib/mediatyp.h +++ b/mimelib/mimelib/mediatyp.h @@ -79,14 +79,14 @@ public: DwMediaType(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwMediaType} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs //. deep copy of {\tt aMediaType}. - //. The tqparent of the new {\tt DwMediaType} object is set to {\tt NULL}. + //. The parent of the new {\tt DwMediaType} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwMediaType} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is {\tt NULL}, {\tt aParent} should point to an object of @@ -96,7 +96,7 @@ public: const DwMediaType& operator = (const DwMediaType& aMediaType); //. This is the assignment operator, which performs a deep copy of - //. {\tt aMediaType}. The tqparent node of the {\tt DwMediaType} + //. {\tt aMediaType}. The parent node of the {\tt DwMediaType} //. object is not changed. virtual void Parse(); @@ -114,7 +114,7 @@ public: //. It should be called whenever one of the object's attributes //. is changed in order to assemble the string representation from //. its broken-down representation. It will be called - //. automatically for this object by the tqparent object's + //. automatically for this object by the parent object's //. {\tt Assemble()} member function if the is-modified flag is set. //. //. This function clears the is-modified flag. diff --git a/mimelib/mimelib/message.h b/mimelib/mimelib/message.h index 3cfac7013..73996664e 100644 --- a/mimelib/mimelib/message.h +++ b/mimelib/mimelib/message.h @@ -43,10 +43,10 @@ //. a {\tt DwHeaders} object and a {\tt DwBody} object. //. //. In the tree (broken-down) representation of message, a {\tt DwMessage} -//. object is almost always a root node, having child nodes but no tqparent node. +//. object is almost always a root node, having child nodes but no parent node. //. The child nodes are the {\tt DwHeaders} object and the {\tt DwBody} object //. it contains. A {\tt DwMessage} may sometimes be an intermediate node. In -//. this special case, the tqparent node is a {\tt DwBody} object of type +//. this special case, the parent node is a {\tt DwBody} object of type //. "message/*" and the {\tt DwMessage} object represents an encapsulated //. message. //. @@ -66,14 +66,14 @@ public: DwMessage(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwMessage} object's string representation to the empty string - //. and sets its tqparent to {\tt NULL}. + //. and sets its parent to {\tt NULL}. //. //. The second constructor is the copy constructor, which performs //. a deep copy of {\tt aMessage}. - //. The tqparent of the new {\tt DwMessage} object is set to {\tt NULL}. + //. The parent of the new {\tt DwMessage} object is set to {\tt NULL}. //. //. The third constructor copies {\tt aStr} to the {\tt DwMessage} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. @@ -81,7 +81,7 @@ public: const DwMessage& operator = (const DwMessage& aMessage); //. This is the assignment operator, which performs a deep copy of - //. {\tt aMessage}. The tqparent node of the {\tt DwMessage} object + //. {\tt aMessage}. The parent node of the {\tt DwMessage} object //. is not changed. virtual DwMessageComponent* Clone() const; diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h index 46ff95cb3..de2c6d891 100644 --- a/mimelib/mimelib/msgcmp.h +++ b/mimelib/mimelib/msgcmp.h @@ -94,21 +94,21 @@ //. to be set. //. //. \item -//. A tqparent. Most message components are part of another component. +//. A parent. Most message components are part of another component. //. A collection of headers is part of a message or body part, a header //. field is part of a collection of headers, a field-body is part -//. of a header field, and so on. The tqparent of +//. of a header field, and so on. The parent of //. a component is the component that contains it. This tree structure -//. is important, since a component's tqparent must be parsed before the +//. is important, since a component's parent must be parsed before the //. component can be. Also, a component's string representation must -//. be assembled before its tqparent's. To maintain consistency in the +//. be assembled before its parent's. To maintain consistency in the //. tree, whenever a component's is-modified flag is set, -//. the component notifies its tqparent to also set its is-modified flag. +//. the component notifies its parent to also set its is-modified flag. //. In this way, an is-modified flag set anywhere in the tree always //. propagates up to the root component. //. //. \item -//. Children. The preceding discussion about a component's tqparent is +//. Children. The preceding discussion about a component's parent is //. relevant to an understanding of a component's tqchildren. A component's //. parse method calls the parse methods of its tqchildren //. after it has executed its own parse method (and, in some cases, created @@ -163,15 +163,15 @@ public: DwMessageComponent(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwMessageComponent} object's string representation to the - //. empty string and sets its tqparent to NULL. + //. empty string and sets its parent to NULL. //. //. The second constructor is the copy constructor, which performs - //. a deep copy of {\tt aCmp}. The tqparent of the new + //. a deep copy of {\tt aCmp}. The parent of the new //. {\tt DwMessageComponent} object is set to NULL. //. //. The third constructor copies {\tt aStr} to the new //. {\tt DwMessageComponent} object's string representation and sets - //. {\tt aParent} as its tqparent. In typical cases, the virtual + //. {\tt aParent} as its parent. In typical cases, the virtual //. member function {\tt Parse()} should be called immediately after //. this constructor to parse the new {\tt DwMessageComponent} object //. and all of its tqchildren into their broken-down representations. @@ -230,11 +230,11 @@ public: //. {\tt DwMessageComponent::Assemble()}. DwMessageComponent* Parent(); - //. Returns the {\tt DwMessageComponent} object that is the tqparent + //. Returns the {\tt DwMessageComponent} object that is the parent //. of this object. void SetParent(DwMessageComponent* aParent); - //. Sets {\tt aParent} as the {\tt DwMessageComponent} object's tqparent. + //. Sets {\tt aParent} as the {\tt DwMessageComponent} object's parent. DwBool IsModified() const; //. Returns 1 if the is-modified flag is set for this @@ -242,7 +242,7 @@ public: void SetModified(); //. Sets the is-modified (dirty) flag for this {\tt DwMessageComponent} - //. object and notifies the object's tqparent to also set its is-modified + //. object and notifies the object's parent to also set its is-modified //. flag. int ClassId() const; diff --git a/mimelib/mimelib/msgid.h b/mimelib/mimelib/msgid.h index 11c1edb15..185e860e9 100644 --- a/mimelib/mimelib/msgid.h +++ b/mimelib/mimelib/msgid.h @@ -40,8 +40,8 @@ //. contain the local-part and the domain. //. //. In the tree (broken-down) representation of message, a {\tt DwMsgId} -//. object may only be a leaf node, having a tqparent but no child nodes. -//. Its tqparent node must be a {\tt DwField} object. +//. object may only be a leaf node, having a parent but no child nodes. +//. Its parent node must be a {\tt DwField} object. //. //. {\tt DwMsgId} has member functions for getting or setting its local-part //. and its domain. You can have the library to create the contents of a @@ -61,14 +61,14 @@ public: DwMsgId(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwMsgId} object's string representation to the empty string - //. and sets its tqparent to NULL. + //. and sets its parent to NULL. //. //. The second constructor is the copy constructor, which performs //. a deep copy of {\tt aMsgId}. - //. The tqparent of the new {\tt DwMsgId} object is set to NULL. + //. The parent of the new {\tt DwMsgId} object is set to NULL. //. //. The third constructor copies {\tt aStr} to the {\tt DwMsgId} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is NULL, {\tt aParent} should point to an object of a class @@ -78,7 +78,7 @@ public: const DwMsgId& operator = (const DwMsgId& aMsgId); //. This is the assignment operator, which performs a deep copy of - //. {\tt aMsgId}. The tqparent node of the {\tt DwMsgId} object + //. {\tt aMsgId}. The parent node of the {\tt DwMsgId} object //. is not changed. virtual void Parse(); diff --git a/mimelib/mimelib/param.h b/mimelib/mimelib/param.h index b1b7560bc..c5ab6a143 100644 --- a/mimelib/mimelib/param.h +++ b/mimelib/mimelib/param.h @@ -62,14 +62,14 @@ public: DwParameter(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwParameter} object's string representation to the empty string - //. and sets its tqparent to NULL. + //. and sets its parent to NULL. //. //. The second constructor is the copy constructor, which copies the //. string representation, attribute, and value from {\tt aParam}. - //. The tqparent of the new {\tt DwParameter} object is set to NULL. + //. The parent of the new {\tt DwParameter} object is set to NULL. //. //. The third constructor copies {\tt aStr} to the {\tt DwParameter} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is NULL, {\tt aParent} should point to an object of a class @@ -93,7 +93,7 @@ public: //. It should be called whenever one of the object's attributes //. is changed in order to assemble the string representation from //. its broken-down representation. It will be called - //. automatically for this object by the tqparent object's + //. automatically for this object by the parent object's //. {\tt Assemble()} member function if the is-modified flag is set. virtual DwMessageComponent* Clone() const; diff --git a/mimelib/mimelib/text.h b/mimelib/mimelib/text.h index c3e084da3..14fd8f7d1 100644 --- a/mimelib/mimelib/text.h +++ b/mimelib/mimelib/text.h @@ -55,14 +55,14 @@ public: DwText(const DwString& aStr, DwMessageComponent* aParent=0); //. The first constructor is the default constructor, which sets the //. {\tt DwText} object's string representation to the empty string - //. and sets its tqparent to NULL. + //. and sets its parent to NULL. //. //. The second constructor is the copy constructor, which copies the //. string representation from {\tt aText}. - //. The tqparent of the new {\tt DwText} object is set to NULL. + //. The parent of the new {\tt DwText} object is set to NULL. //. //. The third constructor copies {\tt aStr} to the {\tt DwText} - //. object's string representation and sets {\tt aParent} as its tqparent. + //. object's string representation and sets {\tt aParent} as its parent. //. The virtual member function {\tt Parse()} should be called immediately //. after this constructor in order to parse the string representation. //. Unless it is NULL, {\tt aParent} should point to an object of a class diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp index 02b02e210..57c546420 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.cpp +++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp @@ -28,8 +28,8 @@ #include <tqlayout.h> -AttendeeSelector::AttendeeSelector(TQWidget * tqparent) - : KDialogBase( tqparent, 0, true, i18n("Select Attendees"), Ok|Cancel, NoDefault, true ) +AttendeeSelector::AttendeeSelector(TQWidget * parent) + : KDialogBase( parent, 0, true, i18n("Select Attendees"), Ok|Cancel, NoDefault, true ) { ui = new AttendeeSelectorWidget( this ); setMainWidget( ui ); diff --git a/plugins/kmail/bodypartformatter/attendeeselector.h b/plugins/kmail/bodypartformatter/attendeeselector.h index 8484d5b1d..f30ce3d1c 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.h +++ b/plugins/kmail/bodypartformatter/attendeeselector.h @@ -32,7 +32,7 @@ class AttendeeSelector : public KDialogBase Q_OBJECT TQ_OBJECT public: - AttendeeSelector( TQWidget *tqparent = 0 ); + AttendeeSelector( TQWidget *parent = 0 ); TQStringList attendees() const; diff --git a/plugins/kmail/bodypartformatter/delegateselector.cpp b/plugins/kmail/bodypartformatter/delegateselector.cpp index b85edc9f8..0f20da93a 100644 --- a/plugins/kmail/bodypartformatter/delegateselector.cpp +++ b/plugins/kmail/bodypartformatter/delegateselector.cpp @@ -28,8 +28,8 @@ #include <tqlabel.h> #include <tqvbox.h> -DelegateSelector::DelegateSelector(TQWidget * tqparent) - : KDialogBase( tqparent, 0, true, i18n("Select delegate"), Ok|Cancel, Ok, true ) +DelegateSelector::DelegateSelector(TQWidget * parent) + : KDialogBase( parent, 0, true, i18n("Select delegate"), Ok|Cancel, Ok, true ) { TQVBox *page = makeVBoxMainWidget(); diff --git a/plugins/kmail/bodypartformatter/delegateselector.h b/plugins/kmail/bodypartformatter/delegateselector.h index c2be8950f..982f93554 100644 --- a/plugins/kmail/bodypartformatter/delegateselector.h +++ b/plugins/kmail/bodypartformatter/delegateselector.h @@ -37,7 +37,7 @@ class DelegateSelector : public KDialogBase TQ_OBJECT public: - DelegateSelector( TQWidget *tqparent = 0 ); + DelegateSelector( TQWidget *parent = 0 ); TQString delegate() const; bool rsvp() const; diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp index 12d1f7fe9..48ac3b5a7 100644 --- a/wizards/groupwarewizard.cpp +++ b/wizards/groupwarewizard.cpp @@ -28,8 +28,8 @@ #include "groupwarewizard.h" -GroupwareWizard::GroupwareWizard( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { setCaption( i18n( "KDE Groupware Wizard" ) ); diff --git a/wizards/groupwarewizard.h b/wizards/groupwarewizard.h index b5b6a5261..1461a6a7f 100644 --- a/wizards/groupwarewizard.h +++ b/wizards/groupwarewizard.h @@ -32,7 +32,7 @@ class GroupwareWizard : public TQWidget TQ_OBJECT public: - GroupwareWizard( TQWidget *tqparent, const char *name = 0 ); + GroupwareWizard( TQWidget *parent, const char *name = 0 ); ~GroupwareWizard(); private: diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index 74933d677..a15b580eb 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -40,8 +40,8 @@ #include "overviewpage.h" -OverViewPage::OverViewPage( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +OverViewPage::OverViewPage( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQGridLayout *tqlayout = new TQGridLayout( this, 7, 4, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/wizards/overviewpage.h b/wizards/overviewpage.h index ebe850306..f5baa323d 100644 --- a/wizards/overviewpage.h +++ b/wizards/overviewpage.h @@ -30,7 +30,7 @@ class OverViewPage : public TQWidget TQ_OBJECT public: - OverViewPage( TQWidget *tqparent, const char *name = 0 ); + OverViewPage( TQWidget *parent, const char *name = 0 ); ~OverViewPage(); private slots: diff --git a/wizards/servertype.h b/wizards/servertype.h index 2f660dc59..c726ea391 100644 --- a/wizards/servertype.h +++ b/wizards/servertype.h @@ -55,7 +55,7 @@ class ServerType : public TQObject */ typedef TQValueList<ConnectionInfo> ConnectionInfoList; - ServerType( TQObject *tqparent, const char *name ):TQObject(tqparent, name) {} + ServerType( TQObject *parent, const char *name ):TQObject(parent, name) {} virtual ~ServerType() {} /** @@ -104,7 +104,7 @@ class ServerType : public TQObject class ServerTypeFactory : public KLibFactory { public: - virtual ServerType *serverType( TQObject *tqparent, const char *name = 0 ) = 0; + virtual ServerType *serverType( TQObject *parent, const char *name = 0 ) = 0; /** Returns the identifier. diff --git a/wizards/servertypemanager.cpp b/wizards/servertypemanager.cpp index fec5bd120..3e55a3947 100644 --- a/wizards/servertypemanager.cpp +++ b/wizards/servertypemanager.cpp @@ -28,8 +28,8 @@ ServerTypeManager* ServerTypeManager::mSelf = 0; static KStaticDeleter<ServerTypeManager> serverManagerDeleter; -ServerTypeManager::ServerTypeManager( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +ServerTypeManager::ServerTypeManager( TQObject *parent, const char *name ) + : TQObject( parent, name ) { loadPlugins(); } diff --git a/wizards/servertypemanager.h b/wizards/servertypemanager.h index c3070dd40..9dcfdfdf7 100644 --- a/wizards/servertypemanager.h +++ b/wizards/servertypemanager.h @@ -61,7 +61,7 @@ class ServerTypeManager : public TQObject void loadPlugins(); - ServerTypeManager( TQObject *tqparent, const char *name = 0 ); + ServerTypeManager( TQObject *parent, const char *name = 0 ); static ServerTypeManager* mSelf; |