summaryrefslogtreecommitdiffstats
path: root/src/designer/src/components
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-01-17 20:14:07 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-20 13:10:57 +0100
commitcf01d7136fb79ee3f8e8522748b08519f0ea528f (patch)
treeed4021fd66f4da1b164ca27e522da28525b473f7 /src/designer/src/components
parent2f2dd0137982e5894b93ca1770c096c19e3dc46c (diff)
whitespace fixes
remove trailing spaces & expand tabs Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/designer/src/components')
-rw-r--r--src/designer/src/components/formeditor/formwindowcursor.cpp6
-rw-r--r--src/designer/src/components/formeditor/formwindowmanager.cpp2
-rw-r--r--src/designer/src/components/formeditor/formwindowsettings.h2
-rw-r--r--src/designer/src/components/formeditor/qmainwindow_container.cpp4
-rw-r--r--src/designer/src/components/objectinspector/objectinspector.cpp2
-rw-r--r--src/designer/src/components/propertyeditor/paletteeditor.cpp14
-rw-r--r--src/designer/src/components/propertyeditor/previewframe.h2
-rw-r--r--src/designer/src/components/taskmenu/menutaskmenu.h2
8 files changed, 17 insertions, 17 deletions
diff --git a/src/designer/src/components/formeditor/formwindowcursor.cpp b/src/designer/src/components/formeditor/formwindowcursor.cpp
index 294373fe3..85665a9a1 100644
--- a/src/designer/src/components/formeditor/formwindowcursor.cpp
+++ b/src/designer/src/components/formeditor/formwindowcursor.cpp
@@ -169,12 +169,12 @@ void FormWindowCursor::setProperty(const QString &name, const QVariant &value)
// build selection
const int N = selectedWidgetCount();
Q_ASSERT(N);
-
+
SetPropertyCommand::ObjectList selection;
- for (int i=0; i<N; ++i)
+ for (int i=0; i<N; ++i)
selection.push_back(selectedWidget(i));
-
+
SetPropertyCommand* setPropertyCommand = new SetPropertyCommand(m_formWindow);
if (setPropertyCommand->init(selection, name, value, current())) {
m_formWindow->commandHistory()->push(setPropertyCommand);
diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp
index 457d15638..8761849d6 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/src/designer/src/components/formeditor/formwindowmanager.cpp
@@ -816,7 +816,7 @@ static inline bool hasManagedLayoutItems(const QDesignerFormEditorInterface *cor
{
if (const QLayout *ml = LayoutInfo::managedLayout(core, w)) {
// Try to find managed items, ignore dummy grid spacers
- const int count = ml->count();
+ const int count = ml->count();
for (int i = 0; i < count; i++)
if (!LayoutInfo::isEmptyItem(ml->itemAt(i)))
return true;
diff --git a/src/designer/src/components/formeditor/formwindowsettings.h b/src/designer/src/components/formeditor/formwindowsettings.h
index b6543e2b1..9bf2be7a3 100644
--- a/src/designer/src/components/formeditor/formwindowsettings.h
+++ b/src/designer/src/components/formeditor/formwindowsettings.h
@@ -45,7 +45,7 @@
#include <QtWidgets/QDialog>
QT_BEGIN_NAMESPACE
-
+
namespace Ui {
class FormWindowSettings;
}
diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp
index 67ccaae59..cfaee7f71 100644
--- a/src/designer/src/components/formeditor/qmainwindow_container.cpp
+++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp
@@ -88,7 +88,7 @@ void QMainWindowContainer::setCurrentIndex(int index)
namespace {
// Pair of <area,break_before>
typedef QPair<Qt::ToolBarArea,bool> ToolBarData;
-
+
ToolBarData toolBarData(QToolBar *me) {
const QMainWindow *mw = qobject_cast<const QMainWindow*>(me->parentWidget());
if (!mw || !mw->layout() || mw->layout()->indexOf(me) == -1)
@@ -96,7 +96,7 @@ namespace {
return ToolBarData(mw->toolBarArea(me), mw->toolBarBreak(me));
}
-Qt::DockWidgetArea dockWidgetArea(QDockWidget *me)
+Qt::DockWidgetArea dockWidgetArea(QDockWidget *me)
{
if (const QMainWindow *mw = qobject_cast<const QMainWindow*>(me->parentWidget())) {
// Make sure that me is actually managed by mw, otherwise
diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index bfd867658..dfa6cfdf7 100644
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/designer/src/components/objectinspector/objectinspector.cpp
@@ -262,7 +262,7 @@ ObjectInspector::ObjectInspectorPrivate::ObjectInspectorPrivate(QDesignerFormEdi
m_treeView->setContextMenuPolicy(Qt::CustomContextMenu);
}
-
+
ObjectInspector::ObjectInspectorPrivate::~ObjectInspectorPrivate()
{
delete m_treeView->itemDelegate();
diff --git a/src/designer/src/components/propertyeditor/paletteeditor.cpp b/src/designer/src/components/propertyeditor/paletteeditor.cpp
index cf4ba20e7..9924c4bd7 100644
--- a/src/designer/src/components/propertyeditor/paletteeditor.cpp
+++ b/src/designer/src/components/propertyeditor/paletteeditor.cpp
@@ -59,7 +59,7 @@ namespace qdesigner_internal {
enum { BrushRole = 33 };
-PaletteEditor::PaletteEditor(QDesignerFormEditorInterface *core, QWidget *parent) :
+PaletteEditor::PaletteEditor(QDesignerFormEditorInterface *core, QWidget *parent) :
QDialog(parent),
m_currentColorGroup(QPalette::Active),
m_paletteModel(new PaletteModel(this)),
@@ -238,7 +238,7 @@ QPalette PaletteEditor::getPalette(QDesignerFormEditorInterface *core, QWidget*
//////////////////////
-PaletteModel::PaletteModel(QObject *parent) :
+PaletteModel::PaletteModel(QObject *parent) :
QAbstractTableModel(parent),
m_compute(true)
{
@@ -419,7 +419,7 @@ BrushEditor::BrushEditor(QDesignerFormEditorInterface *core, QWidget *parent) :
QWidget(parent),
m_button(new QtColorButton(this)),
m_changed(false),
- m_core(core)
+ m_core(core)
{
QLayout *layout = new QHBoxLayout(this);
layout->setMargin(0);
@@ -500,12 +500,12 @@ void RoleEditor::emitResetProperty()
setEdited(false);
emit changed(this);
}
-
+
//////////////////////////
ColorDelegate::ColorDelegate(QDesignerFormEditorInterface *core, QObject *parent) :
QItemDelegate(parent),
m_core(core)
-{
+{
}
QWidget *ColorDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &,
@@ -593,8 +593,8 @@ void ColorDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt,
painter->restore();
}
QItemDelegate::paint(painter, option, index);
-
-
+
+
const QColor color = static_cast<QRgb>(QApplication::style()->styleHint(QStyle::SH_Table_GridLineColor, &option));
const QPen oldPen = painter->pen();
painter->setPen(QPen(color));
diff --git a/src/designer/src/components/propertyeditor/previewframe.h b/src/designer/src/components/propertyeditor/previewframe.h
index b494321d5..933c7b1fd 100644
--- a/src/designer/src/components/propertyeditor/previewframe.h
+++ b/src/designer/src/components/propertyeditor/previewframe.h
@@ -60,7 +60,7 @@ public:
void setPreviewPalette(const QPalette &palette);
void setSubWindowActive(bool active);
-
+
private:
// The user can on some platforms close the mdi child by invoking the system menu.
// Ensure a child is present.
diff --git a/src/designer/src/components/taskmenu/menutaskmenu.h b/src/designer/src/components/taskmenu/menutaskmenu.h
index 186a364e3..301c32bcd 100644
--- a/src/designer/src/components/taskmenu/menutaskmenu.h
+++ b/src/designer/src/components/taskmenu/menutaskmenu.h
@@ -57,7 +57,7 @@ namespace qdesigner_internal {
class PromotionTaskMenu;
// The QMenu task menu provides promotion and a remove option. The actual
-// menu context options are not forwarded since they make only sense
+// menu context options are not forwarded since they make only sense
// when a menu is being edited/visible.
class MenuTaskMenu : public QObject, public QDesignerTaskMenuExtension