summaryrefslogtreecommitdiffstats
path: root/src/svnfrontend/mergedlg_impl.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:49 -0600
commit548395e018d377eaa8fede0fba271da8b6c49fc9 (patch)
tree6b6acd1baf1a63c2dfb1735461d8a1e2e20f8385 /src/svnfrontend/mergedlg_impl.cpp
parentbb7be2361770a435b3e2e8ae2ac4250bf9810bb4 (diff)
downloadtdesvn-548395e018d377eaa8fede0fba271da8b6c49fc9.tar.gz
tdesvn-548395e018d377eaa8fede0fba271da8b6c49fc9.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit bb7be2361770a435b3e2e8ae2ac4250bf9810bb4.
Diffstat (limited to 'src/svnfrontend/mergedlg_impl.cpp')
-rw-r--r--src/svnfrontend/mergedlg_impl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp
index b0c1d87..44a07c5 100644
--- a/src/svnfrontend/mergedlg_impl.cpp
+++ b/src/svnfrontend/mergedlg_impl.cpp
@@ -53,7 +53,7 @@ MergeDlg_impl::MergeDlg_impl(TQWidget *parent, const char *name,bool src1,bool s
m_OutLabel->hide();
}
adjustSize();
- setMinimumSize(minimumSizeHint());
+ setMinimumSize(tqminimumSizeHint());
m_useExternMerge->setChecked(Kdesvnsettings::extern_merge_default());
}
@@ -190,7 +190,7 @@ bool MergeDlg_impl::getMergeRange(Rangeinput_impl::revision_range&range,bool*for
dlg.setHelp("merging-items","tdesvn");
TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
ptr = new MergeDlg_impl(Dialog1Layout,"merge_range_dlg",false,false,false);
- dlg.resize( TQSize(480,360).expandedTo(dlg.minimumSizeHint()) );
+ dlg.resize( TQSize(480,360).expandedTo(dlg.tqminimumSizeHint()) );
if (dlg.exec()!=TQDialog::Accepted) {
return false;
}