summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/conflictdialog.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit36a36a5c1015aa0d03f4515c401e907ddb9d6291 (patch)
tree0212ba6d2c749043134005a41f2bd0379619d40f /kitchensync/src/conflictdialog.h
parent4c6f8d69e2d1501837affb472c4eb8fec4462240 (diff)
downloadtdepim-36a36a5c1015aa0d03f4515c401e907ddb9d6291.tar.gz
tdepim-36a36a5c1015aa0d03f4515c401e907ddb9d6291.zip
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
Diffstat (limited to 'kitchensync/src/conflictdialog.h')
-rw-r--r--kitchensync/src/conflictdialog.h2
1 files changed, 1 insertions, 1 deletions
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;