From cdcb4b0166aefdd382d20e7ff3b5cb217ba54ba8 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sun, 6 May 2007 17:41:49 +0000 Subject: [PATCH] coding style cleanup: fix wrong indenting of members in constructor svn path=/trunk/KDE/kdebase/apps/; revision=661819 --- src/applyviewpropsjob.cpp | 8 ++++---- src/columnviewsettingspage.cpp | 17 +++++++++-------- src/dolphinapplication.cpp | 2 +- src/dolphincolumnview.cpp | 7 ++++--- src/dolphincontextmenu.cpp | 8 ++++---- src/dolphincontroller.cpp | 14 ++++++++------ src/dolphindetailsview.cpp | 4 ++-- src/dolphindirlister.cpp | 8 +++++--- src/dolphinitemcategorizer.cpp | 8 +++++--- src/dolphinmainwindow.cpp | 10 +++++----- src/dolphinnewmenu.cpp | 10 ++++++---- src/dolphinsortfilterproxymodel.cpp | 8 ++++---- src/dolphinstatusbar.cpp | 10 +++++----- src/filterbar.cpp | 5 +++-- src/generalsettingspage.cpp | 12 ++++++------ src/generalviewsettingspage.cpp | 12 ++++++------ src/iconsizedialog.cpp | 18 +++++++++--------- src/iconsviewsettingspage.cpp | 22 +++++++++++----------- src/renamedialog.cpp | 4 ++-- src/sidebartreeview.cpp | 2 +- src/statusbarmessagelabel.cpp | 14 +++++++------- src/treeviewcontextmenu.cpp | 12 +++++++----- src/treeviewsidebarpage.cpp | 10 +++++----- src/viewproperties.cpp | 6 +++--- src/viewpropertiesdialog.cpp | 28 ++++++++++++++-------------- src/viewsettingspage.cpp | 10 +++++----- 26 files changed, 141 insertions(+), 128 deletions(-) diff --git a/src/applyviewpropsjob.cpp b/src/applyviewpropsjob.cpp index ce718946f..c25c3bd5a 100644 --- a/src/applyviewpropsjob.cpp +++ b/src/applyviewpropsjob.cpp @@ -28,10 +28,10 @@ ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir, const ViewProperties& viewProps) : - KIO::Job(), - m_viewProps(0), - m_progress(0), - m_dir(dir) + KIO::Job(), + m_viewProps(0), + m_progress(0), + m_dir(dir) { m_viewProps = new ViewProperties(dir); m_viewProps->setViewMode(viewProps.viewMode()); diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp index cd52c362f..6a25e7e42 100644 --- a/src/columnviewsettingspage.cpp +++ b/src/columnviewsettingspage.cpp @@ -36,13 +36,13 @@ #include ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow, - QWidget* parent) : - KVBox(parent), - m_mainWindow(mainWindow), - m_smallIconSize(0), - m_mediumIconSize(0), - m_largeIconSize(0), - m_fontRequester(0) + QWidget* parent) : + KVBox(parent), + m_mainWindow(mainWindow), + m_smallIconSize(0), + m_mediumIconSize(0), + m_largeIconSize(0), + m_fontRequester(0) { const int spacing = KDialog::spacingHint(); const int margin = KDialog::marginHint(); @@ -108,7 +108,8 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow, } ColumnViewSettingsPage::~ColumnViewSettingsPage() -{} +{ +} void ColumnViewSettingsPage::applySettings() { diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp index ad345dbeb..8c1464d53 100644 --- a/src/dolphinapplication.cpp +++ b/src/dolphinapplication.cpp @@ -27,7 +27,7 @@ #include DolphinApplication::DolphinApplication() : - m_lastId(0) + m_lastId(0) { new ApplicationAdaptor(this); QDBusConnection::sessionBus().registerObject("/dolphin/Application", this); diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index 6941bdc11..734328bc6 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -32,8 +32,8 @@ #include DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* controller) : - QColumnView(parent), - m_controller(controller) + QColumnView(parent), + m_controller(controller) { Q_ASSERT(controller != 0); @@ -73,7 +73,8 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* control } DolphinColumnView::~DolphinColumnView() -{} +{ +} QStyleOptionViewItem DolphinColumnView::viewOptions() const { diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 7b48689cf..ae1656f69 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -50,10 +50,10 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, KFileItem* fileInfo, const KUrl& baseUrl) : - m_mainWindow(parent), - m_fileInfo(fileInfo), - m_baseUrl(baseUrl), - m_context(NoContext) + m_mainWindow(parent), + m_fileInfo(fileInfo), + m_baseUrl(baseUrl), + m_context(NoContext) { // The context menu either accesses the URLs of the selected items // or the items itself. To increase the performance both lists are cached. diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp index 151d27208..545d365bd 100644 --- a/src/dolphincontroller.cpp +++ b/src/dolphincontroller.cpp @@ -20,14 +20,16 @@ #include "dolphincontroller.h" DolphinController::DolphinController(QObject* parent) : - QObject(parent), - m_showPreview(false), - m_zoomInPossible(false), - m_zoomOutPossible(false) -{} + QObject(parent), + m_showPreview(false), + m_zoomInPossible(false), + m_zoomOutPossible(false) +{ +} DolphinController::~DolphinController() -{} +{ +} void DolphinController::triggerContextMenuRequest(const QPoint& pos) { diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index af503723a..4c4102e8b 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -33,8 +33,8 @@ #include DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) : - QTreeView(parent), - m_controller(controller) + QTreeView(parent), + m_controller(controller) { Q_ASSERT(controller != 0); diff --git a/src/dolphindirlister.cpp b/src/dolphindirlister.cpp index a88acc937..8da962b18 100644 --- a/src/dolphindirlister.cpp +++ b/src/dolphindirlister.cpp @@ -22,11 +22,13 @@ #include DolphinDirLister::DolphinDirLister() : - KDirLister() -{} + KDirLister() +{ +} DolphinDirLister::~DolphinDirLister() -{} +{ +} void DolphinDirLister::handleError(KIO::Job* job) { diff --git a/src/dolphinitemcategorizer.cpp b/src/dolphinitemcategorizer.cpp index d599aad8e..34806446b 100644 --- a/src/dolphinitemcategorizer.cpp +++ b/src/dolphinitemcategorizer.cpp @@ -28,11 +28,13 @@ #include DolphinItemCategorizer::DolphinItemCategorizer() : - KItemCategorizer() -{} + KItemCategorizer() +{ +} DolphinItemCategorizer::~DolphinItemCategorizer() -{} +{ +} QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index, int sortRole) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index b87b3cb08..ee4830785 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -73,11 +73,11 @@ #include DolphinMainWindow::DolphinMainWindow(int id) : - KXmlGuiWindow(0), - m_newMenu(0), - m_splitter(0), - m_activeView(0), - m_id(id) + KXmlGuiWindow(0), + m_newMenu(0), + m_splitter(0), + m_activeView(0), + m_id(id) { setObjectName("Dolphin"); m_view[PrimaryIdx] = 0; diff --git a/src/dolphinnewmenu.cpp b/src/dolphinnewmenu.cpp index b78c109cb..5cd8a4d09 100644 --- a/src/dolphinnewmenu.cpp +++ b/src/dolphinnewmenu.cpp @@ -27,12 +27,14 @@ #include DolphinNewMenu::DolphinNewMenu(DolphinMainWindow* mainWin) : - KNewMenu(mainWin->actionCollection(), mainWin, "create_new"), - m_mainWin(mainWin) -{} + KNewMenu(mainWin->actionCollection(), mainWin, "create_new"), + m_mainWin(mainWin) +{ +} DolphinNewMenu::~DolphinNewMenu() -{} +{ +} void DolphinNewMenu::slotResult(KJob* job) { diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp index 024110267..6242bfdd2 100644 --- a/src/dolphinsortfilterproxymodel.cpp +++ b/src/dolphinsortfilterproxymodel.cpp @@ -49,10 +49,10 @@ static DolphinView::Sorting dirModelColumnToDolphinView[] = DolphinSortFilterProxyModel::DolphinSortFilterProxyModel(QObject* parent) : - QSortFilterProxyModel(parent), - m_sortColumn(0), - m_sorting(DolphinView::SortByName), - m_sortOrder(Qt::AscendingOrder) + QSortFilterProxyModel(parent), + m_sortColumn(0), + m_sorting(DolphinView::SortByName), + m_sortOrder(Qt::AscendingOrder) { setDynamicSortFilter(true); diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp index 1f6859a8f..e2b4e68ba 100644 --- a/src/dolphinstatusbar.cpp +++ b/src/dolphinstatusbar.cpp @@ -31,11 +31,11 @@ #include DolphinStatusBar::DolphinStatusBar(DolphinView* parent) : - KHBox(parent), - m_messageLabel(0), - m_spaceInfo(0), - m_progressBar(0), - m_progress(100) + KHBox(parent), + m_messageLabel(0), + m_spaceInfo(0), + m_progressBar(0), + m_progress(100) { setSpacing(4); diff --git a/src/filterbar.cpp b/src/filterbar.cpp index 46c28f3c2..f7c582262 100644 --- a/src/filterbar.cpp +++ b/src/filterbar.cpp @@ -32,7 +32,7 @@ #include "dolphinmainwindow.h" FilterBar::FilterBar(QWidget* parent) : - QWidget(parent) + QWidget(parent) { const int gap = 3; @@ -65,7 +65,8 @@ FilterBar::FilterBar(QWidget* parent) : } FilterBar::~FilterBar() -{} +{ +} void FilterBar::hideEvent(QHideEvent* event) { diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index 4a2b6df68..66426b5c6 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -39,12 +39,12 @@ #include "dolphin_generalsettings.h" GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* parent) : - SettingsPageBase(parent), - m_mainWindow(mainWin), - m_homeUrl(0), - m_startSplit(0), - m_startEditable(0), - m_showDeleteCommand(0) + SettingsPageBase(parent), + m_mainWindow(mainWin), + m_homeUrl(0), + m_startSplit(0), + m_startEditable(0), + m_showDeleteCommand(0) { const int spacing = KDialog::spacingHint(); GeneralSettings* settings = DolphinSettings::instance().generalSettings(); diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp index e35d948b5..42a5cb9de 100644 --- a/src/generalviewsettingspage.cpp +++ b/src/generalviewsettingspage.cpp @@ -37,12 +37,12 @@ #include GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow, - QWidget* parent) : - KVBox(parent), - m_mainWindow(mainWindow), - m_localProps(0), - m_globalProps(0), - m_maxPreviewSize(0) + QWidget* parent) : + KVBox(parent), + m_mainWindow(mainWindow), + m_localProps(0), + m_globalProps(0), + m_maxPreviewSize(0) { GeneralSettings* settings = DolphinSettings::instance().generalSettings(); Q_ASSERT(settings != 0); diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp index 88f1fbeb8..22ce11027 100644 --- a/src/iconsizedialog.cpp +++ b/src/iconsizedialog.cpp @@ -34,14 +34,13 @@ #include IconSizeDialog::IconSizeDialog(QWidget* parent) : - KDialog(parent), - m_iconSize(0), - m_previewSize(0), - m_iconSizeSlider(0), - m_iconSizeViewer(0), - m_previewSizeSlider(0), - m_previewSizeViewer(0) - + KDialog(parent), + m_iconSize(0), + m_previewSize(0), + m_iconSizeSlider(0), + m_iconSizeViewer(0), + m_previewSizeSlider(0), + m_previewSizeViewer(0) { IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); Q_ASSERT(settings != 0); @@ -112,7 +111,8 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) : } IconSizeDialog::~IconSizeDialog() -{} +{ +} void IconSizeDialog::slotButtonClicked(int button) { diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 84270a71d..862cf0c3c 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -40,17 +40,17 @@ #include IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow, - QWidget* parent) : - KVBox(parent), - m_mainWindow(mainWindow), - m_iconSize(0), - m_previewSize(0), - m_iconSizeButton(0), - m_textWidthBox(0), - m_fontRequester(0), - m_textlinesCountBox(0), - m_arrangementBox(0), - m_gridSpacingBox(0) + QWidget* parent) : + KVBox(parent), + m_mainWindow(mainWindow), + m_iconSize(0), + m_previewSize(0), + m_iconSizeButton(0), + m_textWidthBox(0), + m_fontRequester(0), + m_textlinesCountBox(0), + m_arrangementBox(0), + m_gridSpacingBox(0) { const int spacing = KDialog::spacingHint(); const int margin = KDialog::marginHint(); diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp index 190f64b93..7bee7b9e7 100644 --- a/src/renamedialog.cpp +++ b/src/renamedialog.cpp @@ -26,8 +26,8 @@ #include RenameDialog::RenameDialog(const KUrl::List& items) : - KDialog(), - m_renameOneItem(false) + KDialog(), + m_renameOneItem(false) { const QSize minSize = minimumSize(); setMinimumSize(QSize(320, minSize.height())); diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp index 2ab0543fc..05889702e 100644 --- a/src/sidebartreeview.cpp +++ b/src/sidebartreeview.cpp @@ -27,7 +27,7 @@ #include SidebarTreeView::SidebarTreeView(QWidget* parent) : - QTreeView(parent) + QTreeView(parent) { setAcceptDrops(true); setUniformRowHeights(true); diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp index b79448b23..a8956caaf 100644 --- a/src/statusbarmessagelabel.cpp +++ b/src/statusbarmessagelabel.cpp @@ -34,13 +34,13 @@ #include StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) : - QWidget(parent), - m_type(DolphinStatusBar::Default), - m_state(Default), - m_illumination(0), - m_minTextHeight(-1), - m_timer(0), - m_closeButton(0) + QWidget(parent), + m_type(DolphinStatusBar::Default), + m_state(Default), + m_illumination(0), + m_minTextHeight(-1), + m_timer(0), + m_closeButton(0) { setMinimumHeight(K3Icon::SizeSmall); diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp index 9e8809a1f..96287d8d0 100644 --- a/src/treeviewcontextmenu.cpp +++ b/src/treeviewcontextmenu.cpp @@ -34,13 +34,15 @@ #include TreeViewContextMenu::TreeViewContextMenu(QWidget* parent, - KFileItem* fileInfo) : - m_parent(parent), - m_fileInfo(fileInfo) -{} + KFileItem* fileInfo) : + m_parent(parent), + m_fileInfo(fileInfo) +{ +} TreeViewContextMenu::~TreeViewContextMenu() -{} +{ +} void TreeViewContextMenu::open() { diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp index 28fc93397..d2e469945 100644 --- a/src/treeviewsidebarpage.cpp +++ b/src/treeviewsidebarpage.cpp @@ -37,11 +37,11 @@ #include "dolphinsettings.h" TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) : - SidebarPage(parent), - m_dirLister(0), - m_dirModel(0), - m_proxyModel(0), - m_treeView(0) + SidebarPage(parent), + m_dirLister(0), + m_dirModel(0), + m_proxyModel(0), + m_treeView(0) { m_dirLister = new KDirLister(); m_dirLister->setDirOnlyMode(true); diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index 9c4554e7a..21f0c39da 100644 --- a/src/viewproperties.cpp +++ b/src/viewproperties.cpp @@ -37,9 +37,9 @@ #define FILE_NAME "/.directory" ViewProperties::ViewProperties(const KUrl& url) : - m_changedProps(false), - m_autoSave(true), - m_node(0) + m_changedProps(false), + m_autoSave(true), + m_node(0) { KUrl cleanUrl(url); cleanUrl.cleanPath(); diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 11fe8d6f3..99f40bfa9 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -44,20 +44,20 @@ #include ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : - KDialog(dolphinView), - m_isDirty(false), - m_dolphinView(dolphinView), - m_viewProps(0), - m_viewMode(0), - m_sorting(0), - m_sortOrder(0), - m_categorizedSorting(0), - m_additionalInfo(0), - m_showPreview(0), - m_showHiddenFiles(0), - m_applyToCurrentFolder(0), - m_applyToSubFolders(0), - m_useAsDefault(0) + KDialog(dolphinView), + m_isDirty(false), + m_dolphinView(dolphinView), + m_viewProps(0), + m_viewMode(0), + m_sorting(0), + m_sortOrder(0), + m_categorizedSorting(0), + m_additionalInfo(0), + m_showPreview(0), + m_showHiddenFiles(0), + m_applyToCurrentFolder(0), + m_applyToSubFolders(0), + m_useAsDefault(0) { Q_ASSERT(dolphinView != 0); const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps(); diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp index cf5a73258..59f101eb9 100644 --- a/src/viewsettingspage.cpp +++ b/src/viewsettingspage.cpp @@ -36,11 +36,11 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow, QWidget* parent) : - SettingsPageBase(parent), - m_generalPage(0), - m_iconsPage(0), - m_detailsPage(0), - m_columnPage(0) + SettingsPageBase(parent), + m_generalPage(0), + m_iconsPage(0), + m_detailsPage(0), + m_columnPage(0) { QVBoxLayout* topLayout = new QVBoxLayout(this); topLayout->setMargin(0); -- 2.47.3