From 36a36a5c1015aa0d03f4515c401e907ddb9d6291 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmail/subscriptiondialog.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'kmail/subscriptiondialog.cpp') 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 ) { } -- cgit v1.2.1