[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdesvn] src: Move sub2qt helper functions to static functions in svn::Targets
From: Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date: 2016-10-24 18:28:20
Message-ID: E1byjyu-00060n-5C () code ! kde ! org
[Download RAW message or body]
Git commit ed903052cf90e88f7f73310feb9b100a55ff9a19 by Christian Ehrlicher.
Committed on 24/10/2016 at 18:26.
Pushed by chehrlic into branch 'master'.
Move sub2qt helper functions to static functions in svn::Targets
M +0 -2 src/helpers/CMakeLists.txt
D +0 -51 src/helpers/sub2qt.cpp
D +0 -47 src/helpers/sub2qt.h
M +4 -5 src/kiosvn/kiosvn.cpp
M +4 -9 src/svnfrontend/commandexec.cpp
M +1 -2 src/svnfrontend/maintreewidget.cpp
M +7 -8 src/svnfrontend/svnactions.cpp
M +20 -0 src/svnqt/targets.cpp
M +8 -0 src/svnqt/targets.h
http://commits.kde.org/kdesvn/ed903052cf90e88f7f73310feb9b100a55ff9a19
diff --git a/src/helpers/CMakeLists.txt b/src/helpers/CMakeLists.txt
index 55bef95..6b9cc43 100644
--- a/src/helpers/CMakeLists.txt
+++ b/src/helpers/CMakeLists.txt
@@ -26,8 +26,6 @@ set(helperssrc
sshagent.cpp
sshagent.h
stringhelper.h
- sub2qt.cpp
- sub2qt.h
windowgeometryhelper.cpp
windowgeometryhelper.h
)
diff --git a/src/helpers/sub2qt.cpp b/src/helpers/sub2qt.cpp
deleted file mode 100644
index 7edda00..0000000
--- a/src/helpers/sub2qt.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2005-2009 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. *
- ***************************************************************************/
-#include "sub2qt.h"
-
-#include "svnqt/datetime.h"
-#include "svnqt/path.h"
-
-namespace helpers
-{
-namespace sub2qt
-{
-
-svn::Targets fromStringList(const QStringList &paths)
-{
- svn::Paths ret;
- ret.reserve(paths.size());
- Q_FOREACH(const QString &path, paths) {
- ret.push_back(svn::Path(path));
- }
- return svn::Targets(ret);
-}
-
-svn::Targets fromUrlList(const QList<QUrl> &urls)
-{
- svn::Paths ret;
- ret.reserve(urls.size());
- Q_FOREACH(const QUrl &url, urls) {
- ret.push_back(svn::Path(url.isLocalFile() ? url.toLocalFile() : url.url()));
- }
- return svn::Targets(ret);
-}
-
-}
-}
diff --git a/src/helpers/sub2qt.h b/src/helpers/sub2qt.h
deleted file mode 100644
index 61244ab..0000000
--- a/src/helpers/sub2qt.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2005-2009 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 HELPERSSUB2QT_H
-#define HELPERSSUB2QT_H
-
-#include "svnqt/targets.h"
-
-#include <QString>
-#include <QUrl>
-
-namespace helpers
-{
-
-/**
-@author Rajko Albrecht
-*/
-namespace sub2qt
-{
-/**
- * Convert a QStringList into a QVector<Path>
- */
-svn::Targets fromStringList(const QStringList &paths);
-/**
- * Convert a QList<QUrl> into a QVector<Path> (a.k.a svn::Targets)
- */
-svn::Targets fromUrlList(const QList<QUrl> &urls);
-}
-
-}
-#endif
diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp
index 8254e2e..84813b6 100644
--- a/src/kiosvn/kiosvn.cpp
+++ b/src/kiosvn/kiosvn.cpp
@@ -35,7 +35,6 @@
#include "svnqt/client_commit_parameter.h"
#include "svnqt/client_update_parameter.h"
#include "settings/kdesvnsettings.h"
-#include "helpers/sub2qt.h"
#include "helpers/stringhelper.h"
#include "helpers/sshagent.h"
#include "helpers/kdesvn_debug.h"
@@ -318,7 +317,7 @@ void kio_svnProtocol::mkdir(const QUrl &url, int)
void kio_svnProtocol::mkdir(const QList<QUrl> &urls, int)
{
try {
- m_pData->m_Svnclient->mkdir(helpers::sub2qt::fromUrlList(urls), \
getDefaultLog()); + \
m_pData->m_Svnclient->mkdir(svn::Targets::fromUrlList(urls), getDefaultLog()); } \
catch (const svn::ClientException &e) { extraError(KIO::ERR_SLAVE_DEFINED, e.msg());
return;
@@ -807,7 +806,7 @@ void kio_svnProtocol::commit(const QList<QUrl> &urls)
msg = lt[0];
svn::Revision nnum = svn::Revision::UNDEFINED;
svn::CommitParameter commit_parameters;
- commit_parameters.targets(helpers::sub2qt::fromUrlList(urls)).message(msg).depth(svn::DepthInfinity).keepLocks(false);
+ commit_parameters.targets(svn::Targets::fromUrlList(urls)).message(msg).depth(svn::DepthInfinity).keepLocks(false);
try {
nnum = m_pData->m_Svnclient->commit(commit_parameters);
@@ -900,7 +899,7 @@ void kio_svnProtocol::svnlog(int revstart, const QString \
&revstringstart, int re void kio_svnProtocol::revert(const QList<QUrl> &urls)
{
try {
- m_pData->m_Svnclient->revert(helpers::sub2qt::fromUrlList(urls), \
svn::DepthEmpty); + \
m_pData->m_Svnclient->revert(svn::Targets::fromUrlList(urls), svn::DepthEmpty); } \
catch (const svn::ClientException &e) { extraError(KIO::ERR_SLAVE_DEFINED, e.msg());
}
@@ -980,7 +979,7 @@ void kio_svnProtocol::add(const QUrl &wc)
void kio_svnProtocol::wc_delete(const QList<QUrl> &urls)
{
try {
- m_pData->m_Svnclient->remove(helpers::sub2qt::fromUrlList(urls), false);
+ m_pData->m_Svnclient->remove(svn::Targets::fromUrlList(urls), false);
} catch (const svn::ClientException &e) {
extraError(KIO::ERR_SLAVE_DEFINED, e.msg());
return;
diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp
index dadd4ac..7c43727 100644
--- a/src/svnfrontend/commandexec.cpp
+++ b/src/svnfrontend/commandexec.cpp
@@ -24,7 +24,6 @@
#include "svnqt/targets.h"
#include "svnqt/url.h"
#include "svnqt/dirent.h"
-#include "helpers/sub2qt.h"
#include "helpers/ktranslateurl.h"
#include "helpers/sshagent.h"
#include "helpers/windowgeometryhelper.h"
@@ -441,7 +440,7 @@ void CommandExec::slotCmd_get()
void CommandExec::slotCmd_update()
{
- const svn::Targets targets = helpers::sub2qt::fromStringList(m_pCPart->urls);
+ const svn::Targets targets = svn::Targets::fromStringList(m_pCPart->urls);
m_pCPart->m_SvnWrapper->makeUpdate(targets,
(m_pCPart->rev_set ? m_pCPart->start : \
svn::Revision::HEAD), svn::DepthUnknown); }
@@ -485,12 +484,8 @@ void CommandExec::slotCmd_info()
void CommandExec::slotCmd_commit()
{
- svn::Paths targets;
- targets.reserve(m_pCPart->urls.size());
- Q_FOREACH(const QString &str, m_pCPart->urls) {
- targets.push_back(svn::Path(str));
- }
- m_pCPart->m_SvnWrapper->makeCommit(svn::Targets(targets));
+ const svn::Targets targets(svn::Targets::fromStringList(m_pCPart->urls));
+ m_pCPart->m_SvnWrapper->makeCommit(targets);
}
void CommandExec::slotCmd_list()
@@ -560,7 +555,7 @@ void CommandExec::slotCmd_delete()
void CommandExec::slotCmd_add()
{
- m_pCPart->m_SvnWrapper->addItems(helpers::sub2qt::fromStringList(m_pCPart->urls), \
svn::DepthInfinity); + \
m_pCPart->m_SvnWrapper->addItems(svn::Targets::fromStringList(m_pCPart->urls), \
svn::DepthInfinity); }
void CommandExec::slotCmd_revert()
diff --git a/src/svnfrontend/maintreewidget.cpp b/src/svnfrontend/maintreewidget.cpp
index 9ce94a4..e865b00 100644
--- a/src/svnfrontend/maintreewidget.cpp
+++ b/src/svnfrontend/maintreewidget.cpp
@@ -32,14 +32,13 @@
#include "importdir_logmsg.h"
#include "settings/kdesvnsettings.h"
#include "helpers/sshagent.h"
+#include "svnqt/targets.h"
#include "svnqt/url.h"
-#include "svnqt/svnqttypes.h"
#include "fronthelpers/rangeinput_impl.h"
#include "fronthelpers/widgetblockstack.h"
#include "fronthelpers/fronthelpers.h"
#include "ksvnwidgets/commitmsg_impl.h"
#include "ksvnwidgets/deleteform.h"
-#include "helpers/sub2qt.h"
#include "helpers/kdesvn_debug.h"
#include "opencontextmenu.h"
#include "EditIgnorePattern.h"
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 392dfa6..0f27fed 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -55,7 +55,6 @@
#include "fronthelpers/watchedprocess.h"
-#include "helpers/sub2qt.h"
#include "helpers/stringhelper.h"
#include "helpers/kdesvn_debug.h"
#include "helpers/ktranslateurl.h"
@@ -1584,7 +1583,7 @@ bool SvnActions::makeDelete(const QStringList &w)
if (answer != KMessageBox::Yes) {
return false;
}
- return makeDelete(helpers::sub2qt::fromStringList(w));
+ return makeDelete(svn::Targets::fromStringList(w));
}
/*!
@@ -1786,7 +1785,7 @@ void SvnActions::slotRevertItems(const QStringList &displist)
const svn::Depth depth = dlg->getDepth();
delete dlg;
- const svn::Targets target(helpers::sub2qt::fromStringList(displist));
+ const svn::Targets target(svn::Targets::fromStringList(displist));
try {
StopDlg sdlg(m_Data->m_SvnContextListener, \
m_Data->m_ParentList->realWidget(), i18n("Revert"), i18n("Reverting items"));
@@ -2263,7 +2262,7 @@ bool SvnActions::makeMove(const QList<QUrl> &Old, const QString \
&New)
StopDlg sdlg(m_Data->m_SvnContextListener, \
m_Data->m_ParentList->realWidget(), i18n("Move"), i18n("Moving entries"));
connect(this, SIGNAL(sigExtraLogMsg(QString)), &sdlg, \
SLOT(slotExtraMessage(QString)));
- const svn::Targets t(helpers::sub2qt::fromUrlList(Old));
+ const svn::Targets t(svn::Targets::fromUrlList(Old));
m_Data->m_Svnclient->move(svn::CopyParameter(t, \
svn::Path(New)).asChild(true).makeParent(false)); } catch (const svn::Exception &e) \
{ emit clientException(e.msg());
@@ -2292,7 +2291,7 @@ bool SvnActions::makeCopy(const QString &Old, const QString \
&New, const svn::Rev
bool SvnActions::makeCopy(const QList<QUrl> &Old, const QString &New, const \
svn::Revision &rev) {
- const svn::Targets t(helpers::sub2qt::fromUrlList(Old));
+ const svn::Targets t(svn::Targets::fromUrlList(Old));
try {
StopDlg sdlg(m_Data->m_SvnContextListener, \
m_Data->m_ParentList->realWidget(), @@ -2315,7 +2314,7 @@ void \
SvnActions::makeLock(const QStringList &what, const QString &_msg, bool bre return;
}
try {
- m_Data->m_Svnclient->lock(helpers::sub2qt::fromStringList(what), _msg, \
breakit); + m_Data->m_Svnclient->lock(svn::Targets::fromStringList(what), \
_msg, breakit); } catch (const svn::Exception &e) {
emit clientException(e.msg());
return;
@@ -2332,7 +2331,7 @@ void SvnActions::makeUnlock(const QStringList &what, bool \
breakit) return;
}
try {
- m_Data->m_Svnclient->unlock(helpers::sub2qt::fromStringList(what), breakit);
+ m_Data->m_Svnclient->unlock(svn::Targets::fromStringList(what), breakit);
} catch (const svn::Exception &e) {
emit clientException(e.msg());
return;
@@ -2428,7 +2427,7 @@ void SvnActions::checkAddItems(const QString &path, bool \
print_error_box) ++it;
}
if (!displist.isEmpty()) {
- addItems(helpers::sub2qt::fromStringList(displist).targets(), \
svn::DepthEmpty); + \
addItems(svn::Targets::fromStringList(displist).targets(), svn::DepthEmpty); }
}
delete dlg;
diff --git a/src/svnqt/targets.cpp b/src/svnqt/targets.cpp
index a0ff845..5fe7b3b 100644
--- a/src/svnqt/targets.cpp
+++ b/src/svnqt/targets.cpp
@@ -125,4 +125,24 @@ Targets::target(Paths::size_type which) const
}
}
+svn::Targets Targets::fromStringList(const QStringList &paths)
+{
+ svn::Paths ret;
+ ret.reserve(paths.size());
+ Q_FOREACH(const QString &path, paths) {
+ ret.push_back(svn::Path(path));
+ }
+ return svn::Targets(ret);
+}
+
+svn::Targets Targets::fromUrlList(const QList<QUrl> &urls)
+{
+ svn::Paths ret;
+ ret.reserve(urls.size());
+ Q_FOREACH(const QUrl &url, urls) {
+ ret.push_back(svn::Path(url.isLocalFile() ? url.toLocalFile() : url.url()));
+ }
+ return svn::Targets(ret);
+}
+
}
diff --git a/src/svnqt/targets.h b/src/svnqt/targets.h
index 9b18e6c..96e473b 100644
--- a/src/svnqt/targets.h
+++ b/src/svnqt/targets.h
@@ -38,7 +38,10 @@
// apr api
#include <apr_tables.h>
+#include <QList>
+
class QStringList;
+class QUrl;
namespace svn
{
@@ -128,6 +131,11 @@ public:
const Path
target(Paths::size_type which) const;
+ /** convenience functions
+ */
+ static Targets fromStringList(const QStringList &paths);
+ static Targets fromUrlList(const QList<QUrl> &urls);
+
private:
Paths m_targets;
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic