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 | 9abdf0551e3660f55791ce3720d5f7035c06aa19 (patch) | |
| tree | 30466a53042f3fd9ff5d3e4db0dc1120d0d8648b /conduits/docconduit/doc-conflictdialog.h | |
| parent | 539a35866f0bac8f00e493654d4a8ec6863726e2 (diff) | |
| download | kpilot-9abdf0551e3660f55791ce3720d5f7035c06aa19.tar.gz kpilot-9abdf0551e3660f55791ce3720d5f7035c06aa19.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'conduits/docconduit/doc-conflictdialog.h')
| -rw-r--r-- | conduits/docconduit/doc-conflictdialog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conduits/docconduit/doc-conflictdialog.h b/conduits/docconduit/doc-conflictdialog.h index 83cb8d4..e59c17c 100644 --- a/conduits/docconduit/doc-conflictdialog.h +++ b/conduits/docconduit/doc-conflictdialog.h @@ -57,7 +57,7 @@ class ResolutionDialog : public KDialogBase TQ_OBJECT public: - ResolutionDialog( TQWidget* tqparent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); + ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); ~ResolutionDialog(); bool hasConflicts; |