temporary commit to work from a remote desk

.clang-tidy

@@ -23,12 +23,14 @@ Checks: "*,\
 -fuchsia-statically-constructed-objects,\
 -readability-isolate-declaration,\
 -fuchsia-multiple-inheritance,\
+-fuchsia-default-arguments-calls,\
 -fuchsia-trailing-return,\
 -portability-simd-intrinsics,\
 -modernize-use-nodiscard,\
 -hicpp-multiway-paths-covered,\
+-hicpp-deprecated-headers,\
 -cert-msc32-c,\
 -cert-msc51-cpp"
-WarningsAsErrors: '*'
+#WarningsAsErrors: '*'
 HeaderFilterRegex: '*.(h|hpp|hxx)'
 AnalyzeTemporaryDtors: false

CMakeLists.txt

@@ -19,6 +19,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+
 add_definitions(-D_USE_MATH_DEFINES)
 
 # package version

clang-format.sh

@@ -0,0 +1,2 @@
+echo test
+find ./include/* ./src/* ./test/* ./exe/* -type f -not -name "doctest.h" -a \( -name "*.cc" -o -name "*.h" -o -name "*.hpp" \) -exec clang-format -i -style=file {} \;

clang-tidy.sh

@@ -0,0 +1,2 @@
+echo test
+find ./src/* -type f -not -name "doctest.h" -a \( -name "*.cc" -o -name "*.h" -o -name "*.hpp" \) -exec clang-tidy -format-style=file {} \;

src/CMakeLists.txt

@@ -1,6 +1,7 @@
 ## Build poppler ##
 
 ## Basic variables ##
+set(CMAKE_CXX_CLANG_TIDY "clang-tidy;--checks=;--fix-errors;--format-style=file;")
 
 include_directories (
   "${PROJECT_BINARY_DIR}/src"
@@ -22,7 +23,8 @@ if (WIN32)
 elseif (APPLE OR LINUX)
   # Nothing to do for APPLE and linux
 else ()
-  add_definitions (-rdynamic)
+  set(CMAKE_EXE_LINKER_FLAGS -rdynamic ${CMAKE_EXE_LINKER_FLAGS})
+  #add_definitions (-rdynamic)
 endif ()
 
 option (DEBUG_COMPILE "Pass -Wall to CXX_FLAGS" OFF)

src/control/Actions.cpp

@@ -18,7 +18,7 @@ void ActionEnabledListener::registerListener(ActionHandler* handler)
 
 void ActionEnabledListener::unregisterListener()
 {
-	if (this->handler)
+	if (this->handler != nullptr)
 	{
 		this->handler->removeListener(this);
 		this->handler = nullptr;

src/control/ClipboardHandler.cpp

@@ -26,7 +26,7 @@ ClipboardHandler::ClipboardHandler(ClipboardListener* listener, GtkWidget* widge
 	this->listener->clipboardCutCopyEnabled(false);
 
 	gtk_clipboard_request_contents(clipboard, gdk_atom_intern_static_string("TARGETS"),
-								   (GtkClipboardReceivedFunc) receivedClipboardContents, this);
+	                               reinterpret_cast<GtkClipboardReceivedFunc>(receivedClipboardContents), this);
 }
 
 ClipboardHandler::~ClipboardHandler()
@@ -41,19 +41,19 @@ auto ClipboardHandler::paste() -> bool
 	if (this->containsXournal)
 	{
 		gtk_clipboard_request_contents(this->clipboard, atomXournal,
-									   (GtkClipboardReceivedFunc) pasteClipboardContents, this);
+		                               reinterpret_cast<GtkClipboardReceivedFunc>(pasteClipboardContents), this);
 		return true;
 	}
-	else if (this->containsText)
+	if (this->containsText)
 	{
-		gtk_clipboard_request_text(this->clipboard,
-		                           (GtkClipboardTextReceivedFunc) pasteClipboardText, this);
+		gtk_clipboard_request_text(this->clipboard, reinterpret_cast<GtkClipboardTextReceivedFunc>(pasteClipboardText),
+		                           this);
 		return true;
 	}
-	else if (this->containsImage)
+	if (this->containsImage)
 	{
 		gtk_clipboard_request_image(this->clipboard,
-									(GtkClipboardImageReceivedFunc) pasteClipboardImage, this);
+		                            reinterpret_cast<GtkClipboardImageReceivedFunc>(pasteClipboardImage), this);
 		return true;
 	}
 
@@ -95,10 +95,9 @@ class ClipboardContents
 	~ClipboardContents()
 	{
 		g_object_unref(this->image);
-		g_string_free(this->str, true);
+		g_string_free(this->str, 1);
 	}
 
-public:
 
 	static void getFunction(GtkClipboard* clipboard, GtkSelectionData* selection,
 							guint info, ClipboardContents* contents)
@@ -122,7 +121,8 @@ class ClipboardContents
 		}
 		else if (atomXournal == target)
 		{
-			gtk_selection_data_set(selection, target, 8, (guchar*) contents->str->str, contents->str->len);
+			gtk_selection_data_set(selection, target, 8, reinterpret_cast<guchar*>(contents->str->str),
+			                       contents->str->len);
 		}
 	}
 
@@ -140,13 +140,13 @@ class ClipboardContents
 
 static auto svgWriteFunction(GString* string, const unsigned char* data, unsigned int length) -> cairo_status_t
 {
-	g_string_append_len(string, (const gchar*) data, length);
+	g_string_append_len(string, reinterpret_cast<const gchar*>(data), length);
 	return CAIRO_STATUS_SUCCESS;
 }
 
 auto ClipboardHandler::copy() -> bool
 {
-	if (!this->selection)
+	if (this->selection == nullptr)
 	{
 		return false;
 	}
@@ -171,15 +171,15 @@ auto ClipboardHandler::copy() -> bool
 	{
 		if (e->getType() == ELEMENT_TEXT)
 		{
-			textElements = g_list_insert_sorted(textElements, e, (GCompareFunc) ElementCompareFunc);
+			textElements = g_list_insert_sorted(textElements, e, reinterpret_cast<GCompareFunc>(ElementCompareFunc));
 		}
 	}
 
-	string text = "";
+	string text = text;
 	for (GList* l = textElements; l != nullptr; l = l->next)
 	{
-		Text* e = (Text*) l->data;
-		if (text != "")
+		Text* e = static_cast<Text*>(l->data);
+		if (!text.empty())
 		{
 			text += "\n";
 		}
@@ -216,10 +216,9 @@ auto ClipboardHandler::copy() -> bool
 
 	GString* svgString = g_string_sized_new(1048576); // 1MB
 
-	cairo_surface_t* surfaceSVG = cairo_svg_surface_create_for_stream(
-									(cairo_write_func_t) svgWriteFunction, svgString,
-									selection->getWidth(), selection->getHeight()
-									);
+	cairo_surface_t* surfaceSVG =
+	        cairo_svg_surface_create_for_stream(reinterpret_cast<cairo_write_func_t>(svgWriteFunction), svgString,
+	                                            selection->getWidth(), selection->getHeight());
 	cairo_t* crSVG = cairo_create(surfaceSVG);
 
 	view.drawSelection(crSVG, this->selection);
@@ -232,16 +231,16 @@ auto ClipboardHandler::copy() -> bool
 	/////////////////////////////////////////////////////////////////
 
 	GtkTargetList* list = gtk_target_list_new(nullptr, 0);
-	GtkTargetEntry* targets;
-	int n_targets;
+	GtkTargetEntry* targets = nullptr;
+	int n_targets = 0;
 
 	// if we have text elements...
 	if (!text.empty())
 	{
 		gtk_target_list_add_text_targets(list, 0);
 	}
 	// we always copy an image to clipboard
-	gtk_target_list_add_image_targets(list, 0, true);
+	gtk_target_list_add_image_targets(list, 0, 1);
 	gtk_target_list_add(list, atomSvg1, 0, 0);
 	gtk_target_list_add(list, atomSvg2, 0, 0);
 	gtk_target_list_add(list, atomXournal, 0, 0);
@@ -251,14 +250,14 @@ auto ClipboardHandler::copy() -> bool
 	auto* contents = new ClipboardContents(text, image, svgString->str, out.getStr());
 
 	gtk_clipboard_set_with_data(this->clipboard, targets, n_targets,
-								(GtkClipboardGetFunc) ClipboardContents::getFunction,
-								(GtkClipboardClearFunc) ClipboardContents::clearFunction, contents);
+	                            reinterpret_cast<GtkClipboardGetFunc>(ClipboardContents::getFunction),
+	                            reinterpret_cast<GtkClipboardClearFunc>(ClipboardContents::clearFunction), contents);
 	gtk_clipboard_set_can_store(this->clipboard, nullptr, 0);
 
 	gtk_target_table_free(targets, n_targets);
 	gtk_target_list_unref(list);
 
-	g_string_free(svgString, true);
+	g_string_free(svgString, 1);
 
 	return true;
 }
@@ -276,7 +275,7 @@ void ClipboardHandler::setCopyPasteEnabled(bool enabled)
 	{
 		listener->clipboardCutCopyEnabled(true);
 	}
-	else if (!selection)
+	else if (selection == nullptr)
 	{
 		listener->clipboardCutCopyEnabled(false);
 	}
@@ -292,9 +291,8 @@ void ClipboardHandler::ownerChangedCallback(GtkClipboard* clip, GdkEvent* event,
 
 void ClipboardHandler::clipboardUpdated(GdkAtom atom)
 {
-	gtk_clipboard_request_contents(clipboard,
-								   gdk_atom_intern_static_string("TARGETS"),
-								   (GtkClipboardReceivedFunc) receivedClipboardContents, this);
+	gtk_clipboard_request_contents(clipboard, gdk_atom_intern_static_string("TARGETS"),
+	                               reinterpret_cast<GtkClipboardReceivedFunc>(receivedClipboardContents), this);
 }
 
 void ClipboardHandler::pasteClipboardImage(GtkClipboard* clipboard, GdkPixbuf* pixbuf, ClipboardHandler* handler)
@@ -307,7 +305,8 @@ void ClipboardHandler::pasteClipboardContents(GtkClipboard* clipboard, GtkSelect
 {
 	ObjectInputStream in;
 
-	if (in.read((const char*) gtk_selection_data_get_data(selectionData), gtk_selection_data_get_length(selectionData)))
+	if (in.read(reinterpret_cast<const char*>(gtk_selection_data_get_data(selectionData)),
+	            gtk_selection_data_get_length(selectionData)))
 	{
 		handler->listener->clipboardPasteXournal(in);
 	}
@@ -316,25 +315,25 @@ void ClipboardHandler::pasteClipboardContents(GtkClipboard* clipboard, GtkSelect
 void ClipboardHandler::pasteClipboardText(GtkClipboard* clipboard, const gchar* text,
                                           ClipboardHandler* handler)
 {
-	if (text)
+	if (text != nullptr)
 	{
 		handler->listener->clipboardPasteText(text);
 	}
 }
 
 auto gtk_selection_data_targets_include_xournal(GtkSelectionData* selection_data) -> gboolean
 {
-	GdkAtom* targets;
-	gint n_targets;
-	gboolean result = false;
+	GdkAtom* targets = nullptr;
+	gint n_targets = 0;
+	gboolean result = 0;
 
-	if (gtk_selection_data_get_targets(selection_data, &targets, &n_targets))
+	if (gtk_selection_data_get_targets(selection_data, &targets, &n_targets) != 0)
 	{
 		for (int i = 0; i < n_targets; i++)
 		{
 			if (targets[i] == atomXournal)
 			{
-				result = true;
+				result = 1;
 				break;
 			}
 		}
@@ -347,9 +346,9 @@ auto gtk_selection_data_targets_include_xournal(GtkSelectionData* selection_data
 void ClipboardHandler::receivedClipboardContents(GtkClipboard* clipboard, GtkSelectionData* selectionData,
 												 ClipboardHandler* handler)
 {
-	handler->containsText = gtk_selection_data_targets_include_text(selectionData);
-	handler->containsXournal = gtk_selection_data_targets_include_xournal(selectionData);
-	handler->containsImage = gtk_selection_data_targets_include_image(selectionData, false);
+	handler->containsText = (gtk_selection_data_targets_include_text(selectionData) != 0);
+	handler->containsXournal = (gtk_selection_data_targets_include_xournal(selectionData) != 0);
+	handler->containsImage = (gtk_selection_data_targets_include_image(selectionData, 0) != 0);
 
 	handler->listener->clipboardPasteEnabled(handler->containsText || handler->containsXournal || handler->containsImage);
 }