r20173 by jghali - code style fixes

[scribus-commit]

Author: jghali
Date: Thu Jun 18 20:21:30 2015
New Revision: 20173

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20173
Log:
code style fixes

Modified:
    trunk/Scribus/scribus/ui/colorcombo.cpp
    trunk/Scribus/scribus/ui/colorcombo.h

Modified: trunk/Scribus/scribus/ui/colorcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20173&path=/trunk/Scribus/scribus/ui/colorcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorcombo.cpp (original)
+++ trunk/Scribus/scribus/ui/colorcombo.cpp Thu Jun 18 20:21:30 2015
@@ -17,7 +17,7 @@
 #include "commonstrings.h"
 // #include "qdebug.h"
 
-ColorCombo::ColorCombo( QWidget* parent ) : QComboBox(parent)
+ColorCombo::ColorCombo(QWidget* parent) : QComboBox(parent)
 {
 #ifdef Q_OS_MAC
 //	setStyle( new ColorCombo::ScMacStyle() );
@@ -29,7 +29,7 @@
 	setView( lb );
 }
 
-ColorCombo::ColorCombo( bool rw, QWidget* parent ) : QComboBox(parent)
+ColorCombo::ColorCombo(bool rw, QWidget* parent) : QComboBox(parent)
 {
 #ifdef Q_OS_MAC
 //	setStyle( new ColorCombo::ScMacStyle() );
@@ -54,16 +54,16 @@
 		return;
 
 	clb->clear();
-	if ( insertNone )
+	if (insertNone)
 	{
 		clb->addItem(CommonStrings::tr_NoneColor);
 		clb->item(0)->setData(Qt::UserRole, CommonStrings::None);
 	}
-	if ( pixType == ColorCombo::fancyPixmaps )
+	if (pixType == ColorCombo::fancyPixmaps)
 		clb->insertItems(list, ColorListBox::fancyPixmap);
-	else if ( pixType == ColorCombo::widePixmaps )
+	else if (pixType == ColorCombo::widePixmaps)
 		clb->insertItems(list, ColorListBox::widePixmap);
-	else if ( pixType == ColorCombo::smallPixmaps )
+	else if (pixType == ColorCombo::smallPixmaps)
 		clb->insertItems(list, ColorListBox::smallPixmap);
 }
 
@@ -73,32 +73,32 @@
 	if (!clb)
 		return;
 
-	if ( pixType == ColorCombo::fancyPixmaps )
+	if (pixType == ColorCombo::fancyPixmaps)
 		clb->insertItems(list, ColorListBox::fancyPixmap);
-	else if ( pixType == ColorCombo::widePixmaps )
+	else if (pixType == ColorCombo::widePixmaps)
 		clb->insertItems(list, ColorListBox::widePixmap);
-	else if ( pixType == ColorCombo::smallPixmaps )
+	else if (pixType == ColorCombo::smallPixmaps)
 		clb->insertItems(list, ColorListBox::smallPixmap);
 }
 
-void ColorCombo::insertSmallItem( const ScColor& col, ScribusDoc* doc, const QString& colName )
+void ColorCombo::insertSmallItem(const ScColor& col, ScribusDoc* doc, const QString& colName)
 {
 	ColorListBox* clb = dynamic_cast<ColorListBox*>(view());
-	if ( clb )
+	if (clb)
 		clb->addItem( new ColorPixmapItem(ColorPixmapValue(col, doc, colName)), ColorListBox::smallPixmap );
 }
 
-void ColorCombo::insertWideItem ( const ScColor& col, ScribusDoc* doc, const QString& colName )
+void ColorCombo::insertWideItem (const ScColor& col, ScribusDoc* doc, const QString& colName)
 {
 	ColorListBox* clb = dynamic_cast<ColorListBox*>(view());
-	if ( clb )
+	if (clb)
 		clb->addItem( new ColorPixmapItem(ColorPixmapValue(col, doc, colName)), ColorListBox::widePixmap );
 }
 
-void ColorCombo::insertFancyItem( const ScColor& col, ScribusDoc* doc, const QString& colName )
+void ColorCombo::insertFancyItem(const ScColor& col, ScribusDoc* doc, const QString& colName)
 {
 	ColorListBox* clb = dynamic_cast<ColorListBox*>(view());
-	if ( clb )
+	if (clb)
 		clb->addItem( new ColorPixmapItem(ColorPixmapValue(col, doc, colName)), ColorListBox::fancyPixmap );
 }
 

Modified: trunk/Scribus/scribus/ui/colorcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20173&path=/trunk/Scribus/scribus/ui/colorcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorcombo.h (original)
+++ trunk/Scribus/scribus/ui/colorcombo.h Thu Jun 18 20:21:30 2015
@@ -69,9 +69,9 @@
 	void updateBox(ColorList& list, ColorCombo::PixmapType pixType, bool insertNone = true);
 
 	void insertItems(ColorList& list, ColorCombo::PixmapType type);
-	void insertSmallItem( const ScColor& col, ScribusDoc* doc, const QString& colName );
-	void insertWideItem ( const ScColor& col, ScribusDoc* doc, const QString& colName );
-	void insertFancyItem( const ScColor& col, ScribusDoc* doc, const QString& colName );
+	void insertSmallItem(const ScColor& col, ScribusDoc* doc, const QString& colName);
+	void insertWideItem (const ScColor& col, ScribusDoc* doc, const QString& colName);
+	void insertFancyItem(const ScColor& col, ScribusDoc* doc, const QString& colName);
 	void initColorList(ColorList* colorList, ScribusDoc* doc, QString colorValue);
 };