[rkward] rkward: Remove extra semicolons

Yuri Chornoivan null at kde.org
Wed Nov 7 18:16:07 GMT 2018


Git commit 5c52552f5529da4876d1f9106389322df21dc6e0 by Yuri Chornoivan.
Committed on 07/11/2018 at 18:15.
Pushed by yurchor into branch 'master'.

Remove extra semicolons

M  +1    -1    rkward/core/robject.cpp
M  +1    -1    rkward/misc/rkobjectlistview.cpp
M  +2    -2    rkward/misc/xmlhelper.cpp
M  +1    -1    rkward/plugin/rkformula.cpp
M  +4    -4    rkward/rbackend/rkrinterface.cpp
M  +1    -1    rkward/rbackend/rktransmitter.cpp
M  +2    -2    rkward/windows/rkhtmlwindow.cpp

https://commits.kde.org/rkward/5c52552f5529da4876d1f9106389322df21dc6e0

diff --git a/rkward/core/robject.cpp b/rkward/core/robject.cpp
index d421bcc2..cb96b3f2 100644
--- a/rkward/core/robject.cpp
+++ b/rkward/core/robject.cpp
@@ -107,7 +107,7 @@ QString RObject::getDescription () const {
 		QString label = meta_map->value ("label");
 		if (!label.isEmpty ()) return (getShortName () + " (" + label + ')');
 	}
-	return getShortName ();;
+	return getShortName ();
 }
 
 QString RObject::getObjectDescription () const {
diff --git a/rkward/misc/rkobjectlistview.cpp b/rkward/misc/rkobjectlistview.cpp
index 832c51b9..bd6ffb10 100644
--- a/rkward/misc/rkobjectlistview.cpp
+++ b/rkward/misc/rkobjectlistview.cpp
@@ -94,7 +94,7 @@ void RKObjectListView::itemClicked (const QModelIndex& index) {
 	RK_TRACE (APP);
 
 	if (!index.parent ().isValid ()) {  // root level (pseudo) items expand on click
-		QModelIndex fixed_index = model ()->index (index.row (), 0, index.parent ());;
+		QModelIndex fixed_index = model ()->index (index.row (), 0, index.parent ());
 		if (!isExpanded (fixed_index)) {
 			expand (fixed_index);
 			resizeColumnToContents (0);
diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp
index 28b98d9e..f8efd907 100644
--- a/rkward/misc/xmlhelper.cpp
+++ b/rkward/misc/xmlhelper.cpp
@@ -277,7 +277,7 @@ int XMLHelper::getIntAttribute (const QDomElement &element, const QString &name,
 
 	QString res = getStringAttribute (element, name, QString::number (def), debug_level);
 
-	bool valid_number;;
+	bool valid_number;
 	int ret = res.toInt (&valid_number);
 
 	if (!valid_number) {
@@ -293,7 +293,7 @@ double XMLHelper::getDoubleAttribute (const QDomElement &element, const QString
 
 	QString res = getStringAttribute (element, name, QString::number (def), debug_level);
 
-	bool valid_number;;
+	bool valid_number;
 	double ret = res.toDouble (&valid_number);
 
 	if (!valid_number) {
diff --git a/rkward/plugin/rkformula.cpp b/rkward/plugin/rkformula.cpp
index 5a941063..280f4e4d 100644
--- a/rkward/plugin/rkformula.cpp
+++ b/rkward/plugin/rkformula.cpp
@@ -187,7 +187,7 @@ void RKFormula::makeModelString () {
 		}
 		table_string.append (")");
 	} else {
-		if (container) table_string = container->getFullName ();;
+		if (container) table_string = container->getFullName ();
 	}
 	
 	// construct model string
diff --git a/rkward/rbackend/rkrinterface.cpp b/rkward/rbackend/rkrinterface.cpp
index 6b6e7950..2f04484a 100644
--- a/rkward/rbackend/rkrinterface.cpp
+++ b/rkward/rbackend/rkrinterface.cpp
@@ -773,10 +773,10 @@ void RInterface::processRBackendRequest (RBackendRequest *request) {
 	} else if (type == RBackendRequest::ShowMessage) {
 		QString caption = request->params["caption"].toString ();
 		QString message = request->params["message"].toString ();
-		QString button_yes = request->params["button_yes"].toString ();;
-		QString button_no = request->params["button_no"].toString ();;
-		QString button_cancel = request->params["button_cancel"].toString ();;
-		QString def_button = request->params["default"].toString ();;
+		QString button_yes = request->params["button_yes"].toString ();
+		QString button_no = request->params["button_no"].toString ();
+		QString button_cancel = request->params["button_cancel"].toString ();
+		QString def_button = request->params["default"].toString ();
 
 		// NOTE: In order to support non-modal (information) dialogs, we cannot use KMessageBox or QMessgaeBox, below.
 		QDialog* dialog = new QDialog ();
diff --git a/rkward/rbackend/rktransmitter.cpp b/rkward/rbackend/rktransmitter.cpp
index 03fd4cd5..12c39a34 100644
--- a/rkward/rbackend/rktransmitter.cpp
+++ b/rkward/rbackend/rktransmitter.cpp
@@ -135,7 +135,7 @@ RData* RKRBackendSerializer::unserializeData (QDataStream &stream) {
 		ret->setData (data);
 	} else if (type == RData::RealVector) {
 		RData::RealStorage data;
-		stream >> data;;
+		stream >> data;
 		ret->setData (data);
 	} else if (type == RData::StructureVector) {
 		RData::RDataStorage data;
diff --git a/rkward/windows/rkhtmlwindow.cpp b/rkward/windows/rkhtmlwindow.cpp
index 4bd680d2..b797c93f 100644
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@ -664,8 +664,8 @@ void RKHTMLWindowPart::initActions () {
 	QAction* findAhead = actionCollection ()->addAction ("find_ahead", new QAction (i18n ("Find as you type"), this));
 	actionCollection ()->setDefaultShortcut (findAhead, '/');
 	connect (findAhead, &QAction::triggered, window->findbar, &RKFindBar::activate);
-	actionCollection ()->addAction (KStandardAction::FindNext, "find_next", window->findbar, SLOT (forward()));;
-	actionCollection ()->addAction (KStandardAction::FindPrev, "find_previous", window->findbar, SLOT (backward()));;;
+	actionCollection ()->addAction (KStandardAction::FindNext, "find_next", window->findbar, SLOT (forward()));
+	actionCollection ()->addAction (KStandardAction::FindPrev, "find_previous", window->findbar, SLOT (backward()));
 }
 
 void RKHTMLWindowPart::setOutputWindowSkin () {



More information about the rkward-tracker mailing list