summaryrefslogtreecommitdiffstats
path: root/src/svnfrontend/mergedlg_impl.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-04 19:54:24 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-04 19:54:24 +0000
commitd7633c195a464e4d344ada9eea61afd10110598a (patch)
tree1f2da0b135f3ed84955e340cae823f00c4ce7284 /src/svnfrontend/mergedlg_impl.cpp
parent3fa7eb804f67b2789f128075cc2522f398640250 (diff)
downloadtdesvn-d7633c195a464e4d344ada9eea61afd10110598a.tar.gz
tdesvn-d7633c195a464e4d344ada9eea61afd10110598a.zip
Port kdesvn to TQt4
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1230412 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/svnfrontend/mergedlg_impl.cpp')
-rw-r--r--src/svnfrontend/mergedlg_impl.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp
index 28bb02e..ae45803 100644
--- a/src/svnfrontend/mergedlg_impl.cpp
+++ b/src/svnfrontend/mergedlg_impl.cpp
@@ -27,12 +27,12 @@
#include <kdialogbase.h>
#include <klocale.h>
#include <kdebug.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qvbox.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqvbox.h>
-MergeDlg_impl::MergeDlg_impl(QWidget *parent, const char *name,bool src1,bool src2,bool out)
- :MergeDlg(parent, name)
+MergeDlg_impl::MergeDlg_impl(TQWidget *tqparent, const char *name,bool src1,bool src2,bool out)
+ :MergeDlg(tqparent, name)
{
m_SrcOneInput->setMode(KFile::Directory|KFile::File);
if (!src1) {
@@ -53,7 +53,7 @@ MergeDlg_impl::MergeDlg_impl(QWidget *parent, const char *name,bool src1,bool sr
m_OutLabel->hide();
}
adjustSize();
- setMinimumSize(minimumSizeHint());
+ setMinimumSize(tqminimumSizeHint());
m_useExternMerge->setChecked(Kdesvnsettings::extern_merge_default());
}
@@ -61,7 +61,7 @@ MergeDlg_impl::~MergeDlg_impl()
{
}
-void MergeDlg_impl::setSrc1(const QString&what)
+void MergeDlg_impl::setSrc1(const TQString&what)
{
if (what.isEmpty()) {
m_SrcOneInput->setURL("");
@@ -81,7 +81,7 @@ void MergeDlg_impl::setSrc1(const QString&what)
m_SrcOneInput->setURL(uri.url());
}
-void MergeDlg_impl::setSrc2(const QString&what)
+void MergeDlg_impl::setSrc2(const TQString&what)
{
if (what.isEmpty()) {
m_SrcTwoInput->setURL("");
@@ -100,7 +100,7 @@ void MergeDlg_impl::setSrc2(const QString&what)
m_SrcTwoInput->setURL(uri.url());
}
-void MergeDlg_impl::setDest(const QString&what)
+void MergeDlg_impl::setDest(const TQString&what)
{
if (what.isEmpty()) {
m_OutInput->setURL("");
@@ -136,10 +136,10 @@ bool MergeDlg_impl::useExtern()const
return m_useExternMerge->isChecked();
}
-QString MergeDlg_impl::Src1()const
+TQString MergeDlg_impl::Src1()const
{
KURL uri(m_SrcOneInput->url());
- QString proto = svn::Url::transformProtokoll(uri.protocol());
+ TQString proto = svn::Url::transformProtokoll(uri.protocol());
if (proto=="file"&&!m_SrcOneInput->url().startsWith("ksvn+file:")) {
uri.setProtocol("");
} else {
@@ -148,13 +148,13 @@ QString MergeDlg_impl::Src1()const
return uri.url();
}
-QString MergeDlg_impl::Src2()const
+TQString MergeDlg_impl::Src2()const
{
if (m_SrcTwoInput->url().isEmpty()) {
return "";
}
KURL uri(m_SrcTwoInput->url());
- QString proto = svn::Url::transformProtokoll(uri.protocol());
+ TQString proto = svn::Url::transformProtokoll(uri.protocol());
if (proto=="file"&&!m_SrcTwoInput->url().startsWith("ksvn+file:")) {
uri.setProtocol("");
} else {
@@ -163,7 +163,7 @@ QString MergeDlg_impl::Src2()const
return uri.url();
}
-QString MergeDlg_impl::Dest()const
+TQString MergeDlg_impl::Dest()const
{
KURL uri(m_OutInput->url());
uri.setProtocol("");
@@ -181,17 +181,17 @@ Rangeinput_impl::revision_range MergeDlg_impl::getRange()const
*/
bool MergeDlg_impl::getMergeRange(Rangeinput_impl::revision_range&range,bool*force,bool*recursive,bool*ignorerelated,bool*dry,
bool*useExternal,
- QWidget*parent,const char*name)
+ TQWidget*tqparent,const char*name)
{
MergeDlg_impl*ptr = 0;
- KDialogBase dlg(parent,name,true,i18n("Enter merge range"),
+ KDialogBase dlg(tqparent,name,true,i18n("Enter merge range"),
KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help,
KDialogBase::Ok,true);
dlg.setHelp("merging-items","kdesvn");
- QWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
+ TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
ptr = new MergeDlg_impl(Dialog1Layout,"merge_range_dlg",false,false,false);
- dlg.resize( QSize(480,360).expandedTo(dlg.minimumSizeHint()) );
- if (dlg.exec()!=QDialog::Accepted) {
+ dlg.resize( TQSize(480,360).expandedTo(dlg.tqminimumSizeHint()) );
+ if (dlg.exec()!=TQDialog::Accepted) {
return false;
}
range = ptr->getRange();