SVN commit 1004026 by bcooksley: Cleanup headers and whitespace. Fix coding style inconsistencies M +4 -4 app/SettingsBase.cpp M +2 -1 app/SystemSettingsApp.cpp M +1 -3 app/main.cpp M +3 -2 core/BaseMode.cpp M +2 -1 core/MenuModel.cpp M +3 -1 core/ModuleView.cpp M +3 -3 core/ToolTipManager.cpp --- trunk/KDE/kdebase/workspace/systemsettings/app/SettingsBase.cpp #1004025:1004026 @@ -39,8 +39,8 @@ #include "BaseData.h" #include "ModuleView.h" -SettingsBase::SettingsBase( QWidget * parent ) : - KXmlGuiWindow(parent) +SettingsBase::SettingsBase( QWidget * parent ) + : KXmlGuiWindow(parent) { // Ensure delayed loading doesn't cause a crash activeView = 0; @@ -70,7 +70,7 @@ QSize SettingsBase::sizeHint() const { - return QSize(780, 520); + return QSize(720, 600); } void SettingsBase::initApplication() @@ -130,7 +130,7 @@ menuBar()->hide(); // Toolbar & Configuration helpActionMenu->setMenu( dynamic_cast( factory()->container("help", this) ) ); - setMinimumSize(780,520); + setMinimumSize(720,600); toolBar()->setMovable(false); // We don't allow any changes changeToolBar( BaseMode::Search | BaseMode::Configure ); } --- trunk/KDE/kdebase/workspace/systemsettings/app/SystemSettingsApp.cpp #1004025:1004026 @@ -19,7 +19,8 @@ #include "SystemSettingsApp.h" -SystemSettingsApp::SystemSettingsApp() : KUniqueApplication() +SystemSettingsApp::SystemSettingsApp() + : KUniqueApplication() { window = 0; } --- trunk/KDE/kdebase/workspace/systemsettings/app/main.cpp #1004025:1004026 @@ -29,12 +29,10 @@ #include "SystemSettingsApp.h" #include "SettingsBase.h" -#include - int main( int argc, char *argv[] ) { // About data - KAboutData aboutData("systemsettings", 0, ki18n("System Settings"), "1.0", ki18n("Central configuration center for KDE."), + KAboutData aboutData("systemsettings", 0, ki18n("System Settings"), "1.0", ki18n("Central configuration center for KDE."), KAboutData::License_GPL, ki18n("(c) 2009, Ben Cooksley")); aboutData.addAuthor(ki18n("Ben Cooksley"), ki18n("Maintainer"), "ben@eclipse.endoftheinternet.org"); aboutData.addAuthor(ki18n("Mathias Soeken"), ki18n("Developer"), "msoeken@informatik.uni-bremen.de"); --- trunk/KDE/kdebase/workspace/systemsettings/core/BaseMode.cpp #1004025:1004026 @@ -42,8 +42,9 @@ QList tooltipManagers; }; -BaseMode::BaseMode(QObject* parent) - : QObject( parent ), d( new Private() ) +BaseMode::BaseMode( QObject* parent ) + : QObject( parent ) + , d( new Private() ) { } --- trunk/KDE/kdebase/workspace/systemsettings/core/MenuModel.cpp #1004025:1004026 @@ -37,7 +37,8 @@ }; MenuModel::MenuModel( MenuItem * menuRoot, QObject *parent ) - : QAbstractItemModel( parent ), d( new Private() ) + : QAbstractItemModel( parent ) + , d( new Private() ) { d->rootItem = menuRoot; } --- trunk/KDE/kdebase/workspace/systemsettings/core/ModuleView.cpp #1004025:1004026 @@ -58,7 +58,9 @@ KPushButton* mHelp; }; -ModuleView::ModuleView( QWidget * parent ) : QWidget( parent ), d( new Private() ) +ModuleView::ModuleView( QWidget * parent ) + : QWidget( parent ) + , d( new Private() ) { // Configure a layout first d->mLayout = new QVBoxLayout(this); --- trunk/KDE/kdebase/workspace/systemsettings/core/ToolTipManager.cpp #1004025:1004026 @@ -54,9 +54,9 @@ QRect itemRect; }; -ToolTipManager::ToolTipManager(QAbstractItemView* parent) : - QObject(parent), - d(new ToolTipManager::Private) +ToolTipManager::ToolTipManager(QAbstractItemView* parent) + : QObject(parent) + , d(new ToolTipManager::Private) { d->view = parent; d->tooltipManager = KToolTipManager::instance();