Mercurial > ldforge / file diff

--- a/src/MainWindow.cc	Wed Mar 05 20:49:28 2014 +0200
+++ b/src/MainWindow.cc	Sun Mar 09 14:58:46 2014 +0200
@@ -64,8 +64,8 @@
 
 // =============================================================================
 //
-
-MainWindow::MainWindow (QWidget* parent, Qt::WindowFlags flags)
+MainWindow::MainWindow (QWidget* parent, Qt::WindowFlags flags) :
+	QMainWindow (parent, flags)
 {
 	g_win = this;
 	ui = new Ui_LDForgeUI;
@@ -811,25 +811,30 @@
 }
 
 // =============================================================================
-bool confirm (QString msg)
+//
+bool confirm (const QString& message)
 {
 	return confirm (MainWindow::tr ("Confirm"), message);
 }
 
-bool confirm (QString title, QString msg)
+// =============================================================================
+//
+bool confirm (const QString& title, const QString& message)
 {
-	return QMessageBox::question (g_win, title, messag,
+	return QMessageBox::question (g_win, title, message,
 		(QMessageBox::Yes | QMessageBox::No), QMessageBox::No) == QMessageBox::Yes;
 }
 
 // =============================================================================
-void critical (QString msg)
+//
+void critical (const QString& message)
 {
 	QMessageBox::critical (g_win, MainWindow::tr ("Error"), message,
 		(QMessageBox::Close), QMessageBox::Close);
 }
 
 // =============================================================================
+//
 QIcon makeColorIcon (LDColor* colinfo, const int size)
 {
 	// Create an image object and link a painter to it.
@@ -856,6 +861,7 @@
 }
 
 // =============================================================================
+//
 void makeColorComboBox (QComboBox* box)
 {
 	std::map<int, int> counts;
@@ -888,6 +894,8 @@
 	}
 }
 
+// =============================================================================
+//
 void MainWindow::updateDocumentList()
 {
 	m_updatingTabs = true;
@@ -910,6 +918,8 @@
 	m_updatingTabs = false;
 }
 
+// =============================================================================
+//
 void MainWindow::updateDocumentListItem (LDDocument* doc)
 {
 	bool oldUpdatingTabs = m_updatingTabs;
@@ -936,8 +946,10 @@
 }
 
 // =============================================================================
+//
 // A file is selected from the list of files on the left of the screen. Find out
 // which file was picked and change to it.
+//
 void MainWindow::changeCurrentFile()
 {
 	if (m_updatingTabs)
@@ -964,6 +976,8 @@
 	LDDocument::setCurrent (f);
 }
 
+// =============================================================================
+//
 void MainWindow::refreshObjectList()
 {
 #if 0
@@ -978,6 +992,8 @@
 	buildObjList();
 }
 
+// =============================================================================
+//
 void MainWindow::updateActions()
 {
 	History* his = getCurrentDocument()->history();
@@ -989,6 +1005,8 @@
 	ui->actionDrawAngles->setChecked (gl_drawangles);
 }
 
+// =============================================================================
+//
 QImage imageFromScreencap (uchar* data, int w, int h)
 {
 	// GL and Qt formats have R and B swapped. Also, GL flips Y - correct it as well.
@@ -1001,11 +1019,15 @@
 	m_color (color),
 	m_toolButton (toolButton) {}
 
+// =============================================================================
+//
 LDQuickColor LDQuickColor::getSeparator()
 {
 	return LDQuickColor (null, null);
 }
 
+// =============================================================================
+//
 bool LDQuickColor::isSeparator() const
 {
 	return color() == null;