diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
| commit | 3d7cc5d294c8da55ecaefe7a9f5631a72adc610e (patch) | |
| tree | 8e35d69acd1a1c54d9d1b55724c3e72aa69df9e5 /src/optiondialog.cpp | |
| parent | e239d13ed0d22108025907f02d0b659555b137a7 (diff) | |
| download | kdiff3-3d7cc5d294c8da55ecaefe7a9f5631a72adc610e.tar.gz kdiff3-3d7cc5d294c8da55ecaefe7a9f5631a72adc610e.zip | |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/optiondialog.cpp')
| -rw-r--r-- | src/optiondialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index 445fbb0..9fc20ff 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -906,7 +906,7 @@ void OptionDialog::setupMergePage( void ) gbox->addWidget( m_pHistoryEntryStartRegExpLineEdit, line, 1 ); s_historyEntryStartRegExpToolTip = i18n("A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading comment).\n" - "Use tqparentheses to group the keys you want to use for sorting.\n" + "Use parentheses to group the keys you want to use for sorting.\n" "If left empty, then KDiff3 assumes that empty lines separate history entries.\n" "See the documentation for details."); TQToolTip::add( label, s_historyEntryStartRegExpToolTip ); @@ -928,7 +928,7 @@ void OptionDialog::setupMergePage( void ) gbox->addWidget( label, line, 0 ); m_pHistorySortKeyOrderLineEdit = new OptionLineEdit( defaultSortKeyOrder, "HistoryEntryStartSortKeyOrder", &m_historyEntryStartSortKeyOrder, page, this ); gbox->addWidget( m_pHistorySortKeyOrderLineEdit, line, 1 ); - s_historyEntryStartSortKeyOrderToolTip = i18n("Each tqparentheses used in the regular expression for the history start entry\n" + s_historyEntryStartSortKeyOrderToolTip = i18n("Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" "Specify the list of keys (that are numbered in order of occurrence\n" "starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" |