Merge pull request #629 from andreasb242/master

Cleanup

src/control/ToolHandler.cpp

@@ -284,6 +284,7 @@ void ToolHandler::setPenFillEnabled(bool fill)
 	this->tools[TOOL_PEN - TOOL_PEN]->fill = fill;
 
 	// TODO: Currently no toolbar event to send, but if there is a toolbar, here the event should be sent
+	// Ticket #598
 //	if (this->current->type == TOOL_PEN)
 //	{
 //		this->listener->toolSizeChanged();
@@ -318,6 +319,7 @@ void ToolHandler::setHilighterFillEnabled(bool fill)
 	this->tools[TOOL_HILIGHTER - TOOL_PEN]->fill = fill;
 
 	// TODO: Currently no toolbar event to send, but if there is a toolbar, here the event should be sent
+	// Ticket #598
 //	if (this->current->type == TOOL_HILIGHTER)
 //	{
 //		this->listener->toolSizeChanged();

src/control/tools/InputHandler.cpp

@@ -65,7 +65,6 @@ void InputHandler::createStroke(Point p)
 
 		if (xournal->getControl()->getAudioController()->isRecording())
 		{
-			//TODO: move this logic inside AudioController
 			string audioFilename = xournal->getControl()->getAudioController()->getAudioFilename();
 			gint sttime = xournal->getControl()->getAudioController()->getStartTime();
 			int seconds = ((g_get_monotonic_time() / 1000000) - sttime);

src/gui/PageViewFindObjectHelper.h

@@ -183,7 +183,11 @@ protected:
 			}
 			else
 			{
-				//TODO: substitute system(..) with some c++ curl library
+				// curl is required, as also VLC, and other tools.
+				// May this can be replaced with some Socket calls, as HTTP GET is only a
+				// TCP Socket send
+				// e.g. https://stackoverflow.com/questions/28027937/cross-platform-sockets
+				// (Should be less tan 100 lines of code)
 				string psw("password");
 				string command(
 						"curl -s -u \"\":\"" + psw

src/gui/sidebar/AbstractSidebarPage.cpp

@@ -15,13 +15,9 @@ AbstractSidebarPage::~AbstractSidebarPage()
 	this->control = NULL;
 }
 
-bool AbstractSidebarPage::selectPageNr(size_t page, size_t pdfPage)
+void AbstractSidebarPage::selectPageNr(size_t page, size_t pdfPage)
 {
 	XOJ_CHECK_TYPE(AbstractSidebarPage);
-
-	// TODO LOW PRIO why not pageSelected?
-
-	return false;
 }
 
 Control* AbstractSidebarPage::getControl()

src/gui/sidebar/AbstractSidebarPage.h

@@ -56,9 +56,9 @@ public:
 	virtual void setTmpDisabled(bool disabled);
 
 	/**
-	 * Page selected
+	 * A page was selected, supply additional to the Document Page the PDF Page
 	 */
-	virtual bool selectPageNr(size_t page, size_t pdfPage);
+	virtual void selectPageNr(size_t page, size_t pdfPage);
 
 	/**
 	 * Returns the Application controller

src/gui/sidebar/indextree/SidebarIndexPage.cpp

@@ -336,11 +336,11 @@ int SidebarIndexPage::expandOpenLinks(GtkTreeModel* model, GtkTreeIter* parent)
 	return count;
 }
 
-bool SidebarIndexPage::selectPageNr(int page, int pdfPage)
+void SidebarIndexPage::selectPageNr(size_t page, size_t pdfPage)
 {
 	XOJ_CHECK_TYPE(SidebarIndexPage);
 
-	return selectPageNr(page, pdfPage, NULL);
+	selectPageNr(page, pdfPage, NULL);
 }
 
 bool SidebarIndexPage::selectPageNr(size_t page, size_t pdfPage, GtkTreeIter* parent)

src/gui/sidebar/indextree/SidebarIndexPage.h

@@ -51,7 +51,7 @@ public:
 	/**
 	 * @overwrite
 	 */
-	virtual bool selectPageNr(int page, int pdfPage);
+	virtual void selectPageNr(size_t page, size_t pdfPage);
 
 	/**
 	 * Select page in the tree