[PATCH 2/4] Move the divelogs.de preparation function into the C++ class

Thiago Macieira thiago at macieira.org
Mon Dec 16 09:06:52 UTC 2013


This is so we can mark the error messages for translation.

Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
 qt-ui/subsurfacewebservices.cpp | 2 +-
 qt-ui/subsurfacewebservices.h   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index 1daffce..775c7b1 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/qt-ui/subsurfacewebservices.cpp
@@ -98,7 +98,7 @@ static void clear_table(struct dive_table *table)
 	table->nr = 0;
 }
 
-static QString prepare_dives_for_divelogs(const bool selected)
+QString DivelogsDeWebServices::prepare_dives_for_divelogs(const bool selected, QString *errorMsg)
 {
 	static const char errPrefix[] = "divelog.de-upload:";
 	if (!amount_selected) {
diff --git a/qt-ui/subsurfacewebservices.h b/qt-ui/subsurfacewebservices.h
index f6b3ee2..e0e308c 100644
--- a/qt-ui/subsurfacewebservices.h
+++ b/qt-ui/subsurfacewebservices.h
@@ -83,6 +83,7 @@ private:
 	void uploadDives(QIODevice *dldContent);
 	explicit DivelogsDeWebServices (QWidget* parent = 0, Qt::WindowFlags f = 0);
 	void setStatusText(int status);
+	QString prepare_dives_for_divelogs(bool selected, QString *errorMsg);
 	void download_dialog_traverse_xml(xmlNodePtr node, unsigned int *download_status);
 	unsigned int download_dialog_parse_response(const QByteArray& length);
 
-- 
1.7.11.7



More information about the subsurface mailing list