diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 36a36a5c1015aa0d03f4515c401e907ddb9d6291 (patch) | |
| tree | 0212ba6d2c749043134005a41f2bd0379619d40f /kitchensync/src/singleconflictdialog.cpp | |
| parent | 4c6f8d69e2d1501837affb472c4eb8fec4462240 (diff) | |
| download | tdepim-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/singleconflictdialog.cpp')
| -rw-r--r-- | kitchensync/src/singleconflictdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |