SVN_SILENT let's just get this over with and reformant the classes that are pretty much expected to remain

svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=638722

applet.cpp

@@ -42,8 +42,7 @@ class Applet::Private
 
         ~Private()
         {
-            foreach (const QString& engine, loadedEngines)
-            {
+            foreach ( const QString& engine, loadedEngines ) {
                Interface::self()->unloadDataEngine( engine );
             }
         }
@@ -73,8 +72,7 @@ Applet::~Applet()
 
 KSharedConfig::Ptr Applet::appletConfig() const
 {
-    if (!d->appletConfig)
-    {
+    if ( !d->appletConfig ) {
         QString file = KStandardDirs::locateLocal( "appdata",
                                                    "applets/" + instanceName() + "rc",
                                                    true );
@@ -86,8 +84,7 @@ KSharedConfig::Ptr Applet::appletConfig() const
 
 KSharedConfig::Ptr Applet::globalAppletConfig() const
 {
-    if (!d->globalConfig)
-    {
+    if ( !d->globalConfig ) {
         QString file = KStandardDirs::locateLocal( "config", "plasma_" + globalName() + "rc" );
         d->globalConfig = KSharedConfig::openConfig( file );
     }
@@ -97,13 +94,11 @@ KSharedConfig::Ptr Applet::globalAppletConfig() const
 
 bool Applet::loadDataEngine( const QString& name )
 {
-    if (d->loadedEngines.indexOf(name) != -1)
-    {
+    if ( d->loadedEngines.indexOf( name ) != -1 ) {
         return true;
     }
 
-    if (Plasma::Interface::self()->loadDataEngine(name))
-    {
+    if ( Plasma::Interface::self()->loadDataEngine( name ) ) {
         d->loadedEngines.append( name );
         return true;
     }
@@ -127,20 +122,17 @@ QString Applet::instanceName() const
 
 void Applet::watchForFocus(QObject *widget, bool watch)
 {
-    if (!widget)
+    if ( !widget ) {
         return;
+    }
 
     int index = d->watchedForFocus.indexOf(widget);
-    if (watch)
-    {
-        if (index == -1)
-        {
+    if ( watch ) {
+        if ( index == -1 ) {
             d->watchedForFocus.append( widget );
             widget->installEventFilter( this );
         }
-    }
-    else if (index != -1)
-    {
+    } else if ( index != -1 ) {
         d->watchedForFocus.removeAt( index );
         widget->removeEventFilter( this );
     }
@@ -148,8 +140,10 @@ void Applet::watchForFocus(QObject *widget, bool watch)
 
 void Applet::needsFocus( bool focus )
 {
-    if (focus == QWidget::hasFocus() || focus == QGraphicsItem::hasFocus())
+    if ( focus == QWidget::hasFocus() ||
+         focus == QGraphicsItem::hasFocus() ) {
         return;
+    }
 
     emit requestFocus(focus);
 }
@@ -159,12 +153,9 @@ bool Applet::eventFilter(QObject *o, QEvent * e)
     if ( !d->watchedForFocus.contains( o ) )
     {
         if ( e->type() == QEvent::MouseButtonRelease ||
-            e->type() == QEvent::FocusIn)
-        {
+             e->type() == QEvent::FocusIn ) {
             needsFocus( true );
-        }
-        else if (e->type() == QEvent::FocusOut)
-        {
+        } else if ( e->type() == QEvent::FocusOut ) {
             needsFocus( false );
         }
     }

theme.cpp

@@ -40,7 +40,7 @@ Theme::Theme(QObject* parent)
     : QObject(parent),
       d(new Private)
 {
-    KConfig config("plasma");
+    KConfig config( "plasmarc" );
     KConfigGroup group( &config, "Theme" );
     d->themeName = group.readEntry( "name", d->themeName );
 }
@@ -56,8 +56,9 @@ QString Theme::themeName() const
 
 QString Theme::imagePath( const QString& name ) const
 {
-    return KStandardDirs::locate("data", "desktoptheme/" + d->themeName
-                                          + "/" + name + ".svg");
+    return KStandardDirs::locate( "data", "desktoptheme/" +
+                                          d->themeName +
+                                          "/" + name + ".svg" );
 }
 
 }