summaryrefslogtreecommitdiffstats
path: root/src/svnfrontend/mergedlg_impl.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-03-15 17:32:48 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-03-15 17:32:48 +0000
commite2f541c98dfa4081fa3ab3d28f08ea2309281884 (patch)
treecb721a55bc88753ddeb9754dc98ef45e2850ce30 /src/svnfrontend/mergedlg_impl.h
downloadtdesvn-e2f541c98dfa4081fa3ab3d28f08ea2309281884.tar.gz
tdesvn-e2f541c98dfa4081fa3ab3d28f08ea2309281884.zip
Added KDE3 version of kdesvn
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1103685 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/svnfrontend/mergedlg_impl.h')
-rw-r--r--src/svnfrontend/mergedlg_impl.h54
1 files changed, 54 insertions, 0 deletions
diff --git a/src/svnfrontend/mergedlg_impl.h b/src/svnfrontend/mergedlg_impl.h
new file mode 100644
index 0000000..90dc3d8
--- /dev/null
+++ b/src/svnfrontend/mergedlg_impl.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ * Copyright (C) 2005-2007 by Rajko Albrecht *
+ * ral@alwins-world.de *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+#ifndef MERGEDLG_IMPL_H
+#define MERGEDLG_IMPL_H
+
+#include "merge_dlg.h"
+#include "rangeinput_impl.h"
+
+class MergeDlg_impl: public MergeDlg {
+Q_OBJECT
+public:
+ MergeDlg_impl(QWidget *parent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true);
+ virtual ~MergeDlg_impl();
+
+ bool recursive()const;
+ bool force()const;
+ bool ignorerelated()const;
+ bool dryrun()const;
+ bool useExtern()const;
+
+ QString Src1()const;
+ QString Src2()const;
+ QString Dest()const;
+ Rangeinput_impl::revision_range getRange()const;
+
+ void setSrc1(const QString&);
+ void setSrc2(const QString&);
+ void setDest(const QString&);
+
+ static bool getMergeRange(Rangeinput_impl::revision_range&range,
+ bool*force,bool*recursive,bool*ignorerelated,bool*dry,bool*useExternal,QWidget*parent=0,const char*name=0);
+protected slots:
+ virtual void externDisplayToggled(bool);
+
+};
+
+#endif