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.cc | |
| 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.cc')
| -rw-r--r-- | conduits/docconduit/doc-conflictdialog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc index 5ea646b..8d1e211 100644 --- a/conduits/docconduit/doc-conflictdialog.cc +++ b/conduits/docconduit/doc-conflictdialog.cc @@ -39,8 +39,8 @@ #include <tqscrollview.h> -ResolutionDialog::ResolutionDialog( TQWidget* tqparent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) - : KDialogBase( tqparent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { +ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) + : KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { FUNCTIONSETUP; syncInfo=sinfo; hasConflicts=false; |