cleanup: remove more ancient commented code p3

8 files changed, 10 insertions, 129 deletions

diff --git a/src/modules/objects/KvsObject_file.cpp b/src/modules/objects/KvsObject_file.cpp
index 098ef7d99..d0f773b85 100644
--- a/src/modules/objects/KvsObject_file.cpp
+++ b/src/modules/objects/KvsObject_file.cpp
@@ -360,7 +360,7 @@ KVSO_CLASS_FUNCTION(file, readByte)
 	char ch;
 	if(!m_pFile->getChar(&ch))
 		c->warning(__tr2qs_ctx("Read error occurred!", "objects")); // c->error ?
-	//QString szChar = QChar(ch);
+
 	c->returnValue()->setInteger((kvs_int_t)ch);
 	return true;
 }
@@ -406,14 +406,14 @@ KVSO_CLASS_FUNCTION(file, readBlock)
 			c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer object", "objects"));
 			return true;
 		}
-		//m_pFile->flush();
+
 		((KvsObject_memoryBuffer *)pObject)->pBuffer()->append(m_pFile->read(uLen));
 		return true;
 	}
 	else
 	{
 		char * buff = new char[uLen + 1];
-		//m_pFile->flush(); // advice from QFile man page (to avoid trash)
+
 		int rlen = m_pFile->read(buff, uLen);
 		buff[rlen] = '\0';
 		QString szBlock(buff);
@@ -537,7 +537,7 @@ KVSO_CLASS_FUNCTION(file, writeBlock)
 				const char * pData = ((KvsObject_memoryBuffer *)pObject)->pBuffer()->data();
 				int rlen = m_pFile->write(pData, uLen);
 				c->returnValue()->setInteger(rlen);
-				//m_pFile->flush();
+
 			}
 			else
 			{
@@ -557,7 +557,6 @@ KVSO_CLASS_FUNCTION(file, writeBlock)
 			const char * block = szBlock.toUtf8().data();
 			int rlen = m_pFile->write(block, uLen);
 			c->returnValue()->setInteger(rlen);
-			//m_pFile->flush();
 		}
 	}
 	return true;
@@ -568,7 +567,7 @@ KVSO_CLASS_FUNCTION(file, readLine)
 	CHECK_INTERNAL_POINTER(m_pFile)
 	CHECK_FILE_IS_OPEN
 	QString buffer;
-	//bool ok=KviFileUtils::readLine(m_pFile,buffer);
+
 	buffer = m_pFile->readLine();
 	c->returnValue()->setString(buffer);
 	return true;
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index fd618fcea..f4bf3e50a 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -566,18 +566,6 @@ KVSO_CLASS_FUNCTION(pixmap, load)
 	m_currentType = Image;
 	m_pImage->load(szFile);
 	return true;
-	/*
- *	FIXME UNUSED CODE
-	if (m_currentType==Image && m_pImage)
-		delete m_pImage;
-	else if (m_currentType==AnimatedPixmap && m_pAnimatedPixmap)
-		delete m_pAnimatedPixmap;
-	if(!m_pPixmap) m_pPixmap=new QPixmap();
-	m_currentType=Pixmap;
-	m_pPixmap->load(szFile);
-	qDebug("alpha %i",m_pPixmap->hasAlpha());
-	return true;
-*/
 }
 
 KVSO_CLASS_FUNCTION(pixmap, save)
@@ -687,20 +675,6 @@ KVSO_CLASS_FUNCTION(pixmap, grabWidget)
 	*m_pPixmap = QPixmap::grabWidget(((KvsObject_widget *)pObject)->widget());
 	return true;
 
-	/*	FIXME UNUSED CODE
-	QString szFileName;
-	KVSO_PARAMETERS_BEGIN(c)
-			KVSO_PARAMETER("file_name",KVS_PT_STRING,0,szFileName)
-	KVSO_PARAMETERS_END(c)
-	QPrinter printer;//(QPrinter::HighResolution);
-	printer.setOutputFormat(QPrinter::PdfFormat);
-	printer.setPaperSize(QPrinter::A4);
-	printer.setOutputFileName(szFileName);
-
-	QPixmap pixmap=QPixmap::grabWidget(((QTableWidget *)widget()));
-	QPainter painter(&printer);
-	painter.drawPixmap(QPoint(0,0), pixmap, pixmap.rect());
-*/
 }
 
 KVSO_CLASS_FUNCTION(pixmap, height)
@@ -711,8 +685,6 @@ KVSO_CLASS_FUNCTION(pixmap, height)
 		c->returnValue()->setInteger(m_pPixmap->height());
 	else
 		c->returnValue()->setInteger(0);
-	//else if(m_pAnimatedPixmap) c->returnValue()->setInteger(m_pAnimatedPixmap->size().height());
-	//else c->returnValue()->setInteger(m_pPixmap->height());
 	return true;
 }
 
@@ -724,17 +696,9 @@ KVSO_CLASS_FUNCTION(pixmap, width)
 		c->returnValue()->setInteger(m_pPixmap->width());
 	else
 		c->returnValue()->setInteger(0);
-	//else if(m_pAnimatedPixmap) c->returnValue()->setInteger(m_pAnimatedPixmap->size().height());
-	//else c->returnValue()->setInteger(m_pPixmap->height());
 	return true;
 }
 
-/*QPixmap * KvsObject_pixmap::getPixmap()
-{
-	if (!m_pAnimatedPixmap && !m_pPixmap) return new QPixmap();
-	else if(m_pAnimatedPixmap) return m_pAnimatedPixmap->pixmap();
-	else return m_pPixmap;
-}*/
 KVSO_CLASS_FUNCTION(pixmap, frameChangedEvent)
 {
 	emitSignal("frameChanged", c);
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index e72a369b4..2b378e57f 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -562,18 +562,6 @@ KVSO_CLASS_FUNCTION(socket, functionConnect)
 	return true;
 }
 
-/*
-KVSO_CLASS_FUNCTION(socket,functionsetReadBufferSize)
-{
-	kvs_int_t iBufferSize;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("buffer_size",KVS_PT_INTEGER,0,iBufferSize)
-	KVSO_PARAMETERS_END(c)
-	m_pSocket->setReadBufferSize(iBufferSize);
-	return true;
-}
-*/
-
 KVSO_CLASS_FUNCTION(socket, listen)
 {
 	kvs_uint_t uLocalPort;
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index 901994049..74cd1187d 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -240,11 +240,7 @@ KVSO_BEGIN_CONSTRUCTOR(KvsObject_tableWidget, KvsObject_widget)
 KVSO_END_CONSTRUCTOR(KvsObject_tableWidget)
 
 KVSO_BEGIN_DESTRUCTOR(KvsObject_tableWidget)
-/*if (m_pCellItemDelegate)
-{
-	delete m_pCellItemDelegate;
-	m_pCellItemDelegate=0;
-}*/
+
 KVSO_END_DESTRUCTOR(KvsObject_tableWidget)
 
 bool KvsObject_tableWidget::init(KviKvsRunTimeContext * c, KviKvsVariantList *)
diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp
index fa0be17eb..176e55f53 100644
--- a/src/modules/objects/KvsObject_toolButton.cpp
+++ b/src/modules/objects/KvsObject_toolButton.cpp
@@ -31,6 +31,7 @@
 #include "KviIconManager.h"
 
 #include <QMenu>
+
 /*
 	@doc:	toolbutton
 	@keyterms:
@@ -282,24 +283,7 @@ KVSO_CLASS_FUNCTION(toolButton, openPopup)
 	((QToolButton *)widget())->showMenu();
 	return true;
 }
-/*
-KVSO_CLASS_FUNCTION(toolButton,setPopupDelay)
-{
-	kvs_int_t uDelay;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("delay",KVS_PT_UNSIGNEDINTEGER,0,uDelay)
-	KVSO_PARAMETERS_END(c)
-	if (widget())
-		  ((QToolButton *)widget())->setPopupDelay(uDelay);
-	return true;
-}
-KVSO_CLASS_FUNCTION(toolButton,popupDelay)
-{
-	if (widget())
-		c->returnValue()->setInteger(((QToolButton *)widget())->popupDelay());
-	return true;
-}
-*/
+
 KVSO_CLASS_FUNCTION(toolButton, setTextPosition)
 {
 	CHECK_INTERNAL_POINTER(widget())
diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp
index 113b300f8..afaf389ca 100644
--- a/src/modules/objects/KvsObject_treeWidget.cpp
+++ b/src/modules/objects/KvsObject_treeWidget.cpp
@@ -356,19 +356,7 @@ KVSO_CLASS_FUNCTION(treeWidget, currentItem)
 		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
-/*
-KVSO_CLASS_FUNCTION(treeWidget,setColumnText)
-{
-	kvs_int_t uCol;
-	QString szText;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
-		KVSO_PARAMETERS_END(c)
-	if (widget())((QTreeWidget *)widget())->setColumnText(uCol,szText);
-    return true;
-}
-*/
+
 KVSO_CLASS_FUNCTION(treeWidget, setColumnCount)
 {
 	kvs_uint_t uCol;
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 89d07f0fe..0a0a24354 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -623,24 +623,7 @@ KVSO_CLASS_FUNCTION(webView, removeFromDocument)
 	element.removeFromDocument();
 	return true;
 }
-/*KVSO_CLASS_FUNCTION(webView,cloneElement)
-{
-	kvs_int_t iEleId;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("element_identifier",KVS_PT_INTEGER,0,iEleId)
-	KVSO_PARAMETERS_END(c)
-	QWebElement element=getElement(iEleId);
-	if (element.isNull())
-	{
-		c->warning(__tr2qs_ctx("Document element with ID %d doesn't exist","objects"),iEleId);
-		return true;
-	}
-	element.removeFromDocument();
-	int id=insertElement(element.clone(),true);
-	c->returnValue()->setInteger((kvs_int_t) id);
-	return true;
-}
-*/
+
 KVSO_CLASS_FUNCTION(webView, appendInside)
 {
 	kvs_int_t iEleId;
@@ -1294,13 +1277,7 @@ void KvsObject_webView::slotOnMouseOut(QString szParam)
 	callFunction(this, "jsMouseOutEvent", &params);
 }
 
-/*KVSO_CLASS_FUNCTION(webView,jsWindowObjectClearedEvent)
-{
-	emitSignal("jsWindowObjectCleared",c,c->params());
-	return true;
-}*/
 // slots
-
 void KvsObject_webView::slotLoadFinished(bool bOk)
 {
 	if(bOk)
@@ -1327,12 +1304,6 @@ void KvsObject_webView::slotLinkClicked(const QUrl & url)
 	KviKvsVariantList params(new KviKvsVariant(szUrl));
 	callFunction(this, "linkClickedEvent", &params);
 }
-/*void KvsObject_webView::javaScriptWindowObjectCleared(const QUrl &url)
-{
-	//KviKvsVariantList *lParams=0;
-	//callFunction(this,"jsWindowObjectClearedEvent",lParams);
-	addToJavaScriptWindowObject
-}*/
 
 void KvsObject_webView::slotDownloadRequest(const QNetworkRequest & r)
 {
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 8f60a145e..5b81be377 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -992,16 +992,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 			return ret;
 		}
 	}
-	/*
-	if(o->parent())
-	{
-		qDebug("Propagation to parent");
-		return KviKvsObject::eventFilter(o->parent(),e);
-	} else {
-		qDebug("Propagation to object");
-	*/
 	return KviKvsObject::eventFilter(o, e);
-	//}
 }
 
 KVSO_CLASS_FUNCTION(widget, show)