Mercurial > ldforge / changeset

--- a/src/addObjectDialog.cpp	Sat Feb 13 04:06:49 2016 +0200
+++ b/src/addObjectDialog.cpp	Sat Feb 13 04:14:43 2016 +0200
@@ -95,8 +95,8 @@
 			coordCount = 3;
 			tw_subfileList = new QTreeWidget();
 			tw_subfileList->setHeaderLabel (tr ("Primitives"));
-			populatePrimitivesTree (tw_subfileList, (obj ? static_cast<LDSubfileReference*> (obj)->fileInfo()->name() : ""));
-
+			populatePrimitivesTree (tw_subfileList,
+									(obj ? static_cast<LDSubfileReference*> (obj)->fileInfo()->name() : ""));
 			connect (tw_subfileList, SIGNAL (itemSelectionChanged()), this, SLOT (slot_subfileTypeChanged()));
 			lb_subfileName = new QLabel ("File:");
 			le_subfileName = new QLineEdit;

--- a/src/documentmanager.cpp	Sat Feb 13 04:06:49 2016 +0200
+++ b/src/documentmanager.cpp	Sat Feb 13 04:14:43 2016 +0200
@@ -298,7 +298,8 @@
 	return objs;
 }
 
-LDDocument* DocumentManager::openDocument (QString path, bool search, bool implicit, LDDocument* fileToOverride, bool* aborted)
+LDDocument* DocumentManager::openDocument (QString path, bool search, bool implicit, LDDocument* fileToOverride,
+										   bool* aborted)
 {
 	// Convert the file name to lowercase when searching because some parts contain subfile
 	// subfile references with uppercase file names. I'll assume here that the library will always

--- a/src/documentmanager.h	Sat Feb 13 04:06:49 2016 +0200
+++ b/src/documentmanager.h	Sat Feb 13 04:14:43 2016 +0200
@@ -41,7 +41,8 @@
 	bool isSafeToCloseAll();
 	LDObjectList loadFileContents (QFile* fp, int* numWarnings, bool* ok);
 	void loadLogoedStuds();
-	LDDocument* openDocument (QString path, bool search, bool implicit, LDDocument* fileToOverride = nullptr, bool* aborted = nullptr);
+	LDDocument* openDocument (QString path, bool search, bool implicit, LDDocument* fileToOverride = nullptr,
+							  bool* aborted = nullptr);
 	QFile* openLDrawFile (QString relpath, bool subdirs, QString* pathpointer);
 	void openMainModel (QString path);
 	bool preInline (LDDocument* doc, LDObjectList&, bool deep, bool renderinline);

--- a/src/mainwindow.cpp	Sat Feb 13 04:06:49 2016 +0200
+++ b/src/mainwindow.cpp	Sat Feb 13 04:14:43 2016 +0200
@@ -90,7 +90,8 @@
 	rendererLayout->addWidget (renderer());
 
 	connect (ui.objectList, SIGNAL (itemSelectionChanged()), this, SLOT (selectionChanged()));
-	connect (ui.objectList, SIGNAL (itemDoubleClicked (QListWidgetItem*)), this, SLOT (objectListDoubleClicked (QListWidgetItem*)));
+	connect (ui.objectList, SIGNAL (itemDoubleClicked (QListWidgetItem*)), this,
+			 SLOT (objectListDoubleClicked (QListWidgetItem*)));
 	connect (m_tabs, SIGNAL (currentChanged(int)), this, SLOT (tabSelected()));
 	connect (m_tabs, SIGNAL (tabCloseRequested (int)), this, SLOT (closeTab (int)));
 

--- a/src/radioGroup.cpp	Sat Feb 13 04:06:49 2016 +0200
+++ b/src/radioGroup.cpp	Sat Feb 13 04:14:43 2016 +0200
@@ -71,9 +71,10 @@
 
 // =============================================================================
 //
-RadioGroup::RadioGroup (const QString& title, QList<char const*> entries, int const defaultId, const Qt::Orientation orient, QWidget* parent) :
-		QGroupBox (title, parent),
-		m_defId (defaultId)
+RadioGroup::RadioGroup (const QString& title, QList<char const*> entries, int const defaultId,
+						const Qt::Orientation orient, QWidget* parent) :
+	QGroupBox (title, parent),
+	m_defId (defaultId)
 {
 	init (orient);
 	m_oldId = m_defId;

--- a/src/toolsets/viewtoolset.cpp	Sat Feb 13 04:06:49 2016 +0200
+++ b/src/toolsets/viewtoolset.cpp	Sat Feb 13 04:14:43 2016 +0200
@@ -89,8 +89,11 @@
 			continue;
 
 		// For subfiles, type check is not enough, we check the name of the document as well.
-		if (type == OBJ_SubfileReference and not subfilenames.contains (static_cast<LDSubfileReference*> (obj)->fileInfo()->name()))
+		if (type == OBJ_SubfileReference
+			and not subfilenames.contains (static_cast<LDSubfileReference*> (obj)->fileInfo()->name()))
+		{
 			continue;
+		}
 
 		obj->select();
 	}