fixing some EBN issues

svn path=/trunk/KDE/kdebase/workspace/; revision=542916

client.cpp

@@ -1335,15 +1335,15 @@ void Client::setCaption( const QString& _s, bool force )
         bool was_suffix = ( !cap_suffix.isEmpty());
         QString machine_suffix;
         if( wmClientMachine( false ) != "localhost" && !isLocalMachine( wmClientMachine( false )))
-            machine_suffix = " <@" + wmClientMachine( true ) + ">";
+            machine_suffix = " <@" + wmClientMachine( true ) + '>';
-        QString shortcut_suffix = !shortcut().isNull() ? ( " {" + shortcut().toString() + "}" ) : "";
+        QString shortcut_suffix = !shortcut().isNull() ? ( " {" + shortcut().toString() + '}' ) : "";
         cap_suffix = machine_suffix + shortcut_suffix;
         if ( ( !isSpecialWindow() || isToolbar()) && workspace()->findClient( FetchNameInternalPredicate( this ))) 
             {
             int i = 2;
             do 
                 {
-                cap_suffix = machine_suffix + " <" + QString::number(i) + ">" + shortcut_suffix;
+                cap_suffix = machine_suffix + " <" + QString::number(i) + '>' + shortcut_suffix;
                 i++;
                 } while ( workspace()->findClient( FetchNameInternalPredicate( this )));
             info->setVisibleName( caption().toUtf8() );

clients/kwmtheme/cli_installer/main.cpp

@@ -68,7 +68,7 @@ int main(int argc, char **argv)
 
     QFileInfo fi(f);
     KSimpleConfig input(fi.absoluteFilePath());
-    srcStr = fi.dirPath(true) + "/";
+    srcStr = fi.dirPath(true) + '/';
     KConfig *output = KGlobal::config();
     input.setGroup("Window Border");
     output->setGroup("General");

geometry.cpp

@@ -744,10 +744,10 @@ QRect Client::adjustedClientArea( const QRect &desktopArea, const QRect& area )
     // Handle struts at xinerama edges that are inside the virtual screen.
     // They're given in virtual screen coordinates, make them affect only
     // their xinerama screen.
-    stareaL.setLeft( QMAX( stareaL.left(), screenarea.left()));
+    stareaL.setLeft( qMax( stareaL.left(), screenarea.left()));
-    stareaR.setRight( QMIN( stareaR.right(), screenarea.right()));
+    stareaR.setRight( qMin( stareaR.right(), screenarea.right()));
-    stareaT.setTop( QMAX( stareaT.top(), screenarea.top()));
+    stareaT.setTop( qMax( stareaT.top(), screenarea.top()));
-    stareaB.setBottom( QMIN( stareaB.bottom(), screenarea.bottom()));
+    stareaB.setBottom( qMin( stareaB.bottom(), screenarea.bottom()));
 
     if (stareaL . intersects (area)) {
 //        kDebug () << "Moving left of: " << r << " to " << stareaL.right() + 1 << endl;

kcmkwin/kwinrules/detectwidget.cpp

@@ -101,7 +101,7 @@ void DetectDialog::executeDialog()
         I18N_NOOP( "Utility Window" ),
         I18N_NOOP( "Splash Screen" )
         };
-    widget->class_label->setText( wmclass_class + " (" + wmclass_name + ' ' + wmclass_class + ")" );
+    widget->class_label->setText( wmclass_class + " (" + wmclass_name + ' ' + wmclass_class + ')' );
     widget->role_label->setText( role );
     widget->use_role->setEnabled( !role.isEmpty());
     if( widget->use_role->isEnabled())

kcmkwin/kwinrules/ruleswidget.cpp

@@ -113,7 +113,7 @@ RulesWidget::RulesWidget( QWidget* parent )
     for( i = 1;
          i <= module.numberOfDesktops();
          ++i )
-        desktop->addItem( QString::number( i ).rightJustified( 2 ) + ":" + module.desktopName( i ));
+        desktop->addItem( QString::number( i ).rightJustified( 2 ) + ':' + module.desktopName( i ));
     desktop->addItem( i18n( "All Desktops" ));
     }
 
@@ -206,7 +206,7 @@ static QString positionToStr( const QPoint& p )
     {
     if( p == invalidPoint )
         return QString();
-    return QString::number( p.x()) + "," + QString::number( p.y());
+    return QString::number( p.x()) + ',' + QString::number( p.y());
     }
 
 static QPoint strToPosition( const QString& str )
@@ -221,7 +221,7 @@ static QString sizeToStr( const QSize& s )
     {
     if( !s.isValid())
         return QString();
-    return QString::number( s.width()) + "," + QString::number( s.height());
+    return QString::number( s.width()) + ',' + QString::number( s.height());
     }
 
 static QSize strToSize( const QString& str )

tabbox.cpp

@@ -385,7 +385,7 @@ void TabBox::drawContents( QPainter * )
                     s = workspace()->desktopName((*it)->desktop()) + ": ";
 
                   if ( (*it)->isMinimized() )
-                    s += QString("(") + (*it)->caption() + ")";
+                    s += '(' + (*it)->caption() + ')';
                   else
                     s += (*it)->caption();
 

tools/xreply/xreply.c

@@ -7,7 +7,7 @@
  exits. If set to a number, backtrace for every roundtrip will be printed, and the
  backtraces will be as deep as the given number. If set to C<number> (e.g. C10),
  the backtraces will be "compressed" - every backtrace will be printed only once
- after the process exits, together with number of times it occured.
+ after the process exits, together with number of times it occurred.
 
 */
 

useractions.cpp

@@ -183,7 +183,7 @@ void Workspace::setTransButtonText(int value)
     else if(value < 10)
         transButton->setText("00"+QString::number(value)+" %");
     else if(value < 100)
-        transButton->setText("0"+QString::number(value)+" %");
+        transButton->setText('0'+QString::number(value)+" %");
     }
 
 void Workspace::resetClientOpacity()