clean up some kDebugs and kWarnings.

shorten some extra long lines.

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=870290

animator.cpp

@@ -501,7 +501,7 @@ void Animator::setInitialPixmap(int id, const QPixmap &pixmap)
     QMap<int, ElementAnimationState*>::iterator it = d->animatedElements.find(id);
 
     if (it == d->animatedElements.end()) {
-        kDebug() << "Animator::setInitialPixmap(" << id << ") found no entry for it!";
+        kDebug() << "No entry found for id " << id;
         return;
     }
 

applet.cpp

@@ -1716,7 +1716,9 @@ void AppletPrivate::init()
     q->setLayoutDirection(qApp->layoutDirection());
 
     if (!appletDescription.isValid()) {
-        kDebug() << "Check your constructor! You probably want to be passing in a Service::Ptr or a QVariantList with a valid storageid as arg[0].";
+        kDebug() << "Check your constructor! "
+                 << "You probably want to be passing in a Service::Ptr "
+                 << "or a QVariantList with a valid storageid as arg[0].";
         return;
     }
 
@@ -1725,16 +1727,20 @@ void AppletPrivate::init()
     // we have a scripted plasmoid
     if (!api.isEmpty()) {
         // find where the Package is
-        QString path = KStandardDirs::locate("data",
-                                             "plasma/plasmoids/" + appletDescription.pluginName() + "/");
+        QString path = KStandardDirs::locate(
+            "data",
+            "plasma/plasmoids/" + appletDescription.pluginName() + "/");
 
         if (path.isEmpty()) {
-            q->setFailedToLaunch(true, i18n("Could not locate the %1 package required for the %2 widget.",
-                                            appletDescription.pluginName(), appletDescription.name()));
+            q->setFailedToLaunch(
+                true,
+                i18n("Could not locate the %1 package required for the %2 widget.",
+                     appletDescription.pluginName(), appletDescription.name()));
         } else {
             // create the package and see if we have something real
             //kDebug() << "trying for" << path;
-            PackageStructure::Ptr structure = Plasma::packageStructure(api, Plasma::AppletComponent);
+            PackageStructure::Ptr structure =
+                Plasma::packageStructure(api, Plasma::AppletComponent);
             structure->setPath(path);
             package = new Package(path, structure);
 

appletbrowser/kcategorizeditemsviewmodels.cpp

@@ -94,7 +94,7 @@ void DefaultItemFilterProxyModel::setSourceModel(QAbstractItemModel *sourceModel
     QStandardItemModel *model = qobject_cast<QStandardItemModel*>(sourceModel);
 
     if (!model) {
-        kWarning() << "DefaultItemFilterProxyModel::setSourceModel expects a QStandardItemModel!";
+        kWarning() << "Expecting a QStandardItemModel!";
         return;
     }
 

package.cpp

@@ -95,7 +95,7 @@ bool Package::isValid() const
 
     foreach (const char *dir, d->structure->requiredDirectories()) {
         if (!QFile::exists(d->basePath + d->structure->contentsPrefix() + d->structure->path(dir))) {
-            kWarning(505) << "Could not find required directory" << dir;
+            kWarning() << "Could not find required directory" << dir;
             d->valid = false;
             return false;
         }
@@ -103,8 +103,8 @@ bool Package::isValid() const
 
     foreach (const char *file, d->structure->requiredFiles()) {
         if (!QFile::exists(d->basePath + d->structure->contentsPrefix() + d->structure->path(file))) {
-            kWarning(505) << "Could not find required file" << file << ", look in"
-                          << d->basePath + d->structure->contentsPrefix() + d->structure->path(file) << endl;
+            kWarning() << "Could not find required file" << file << ", look in"
+                       << d->basePath + d->structure->contentsPrefix() + d->structure->path(file) << endl;
             d->valid = false;
             return false;
         }
@@ -426,7 +426,7 @@ bool Package::createPackage(const PackageMetadata &metadata,
 {
     Q_UNUSED(icon)
     if (!metadata.isValid()) {
-        kWarning(550) << "Metadata file is not complete";
+        kWarning() << "Metadata file is not complete";
         return false;
     }
 

scripting/scriptengine.cpp

@@ -123,18 +123,18 @@ KService::List engineOffers(const QString &language, ComponentType type)
 
     QString component;
     switch (type) {
-        case AppletComponent:
-            component = "Applet";
-            break;
-        case DataEngineComponent:
-            component = "DataEngine";
-            break;
-        case RunnerComponent:
-            component = "Runner";
-            break;
-        default:
-            return KService::List();
-            break;
+    case AppletComponent:
+        component = "Applet";
+        break;
+    case DataEngineComponent:
+        component = "DataEngine";
+        break;
+    case RunnerComponent:
+        component = "Runner";
+        break;
+    default:
+        return KService::List();
+        break;
     }
 
     QString constraint = QString("[X-Plasma-API] == '%1' and "
@@ -143,7 +143,7 @@ KService::List engineOffers(const QString &language, ComponentType type)
 /*    kDebug() << "********************* loadingApplet with Plasma/ScriptEngine" << constraint
              << "resulting in" << offers.count() << "results";*/
     if (offers.isEmpty()) {
-        kDebug() << "ScriptEngine::load: no offers for \"" << language << "\"";
+        kDebug() << "No offers for \"" << language << "\"";
     }
 
     return offers;

svg.cpp

@@ -106,7 +106,7 @@ class SvgPrivate
                 path = imagePath;
 
                 if (!QFile::exists(path)) {
-                    kDebug() << "Plasma::Svg: file '" << path << "' does not exist!";
+                    kDebug() << "file '" << path << "' does not exist!";
                 }
             }
         }

widgets/signalplotter.cpp

@@ -169,9 +169,9 @@ void SignalPlotter::addSample(const QList<double>& sampleBuf)
     if (d->samples < 4) {
         // It might be possible, under some race conditions, for addSample
         // to be called before d->samples is set. This is just to be safe.
-        kDebug(1215) << "Error - d->samples is only " << d->samples << endl;
+        kDebug() << "Error - d->samples is only " << d->samples;
         updateDataBuffers();
-        kDebug(1215) << "d->samples is now " << d->samples << endl;
+        kDebug() << "d->samples is now " << d->samples;
         if (d->samples < 4) {
             return;
         }
@@ -207,14 +207,14 @@ void SignalPlotter::addSample(const QList<double>& sampleBuf)
 void SignalPlotter::reorderPlots(const QList<uint>& newOrder)
 {
     if (newOrder.count() != d->plotColors.count()) {
-        kDebug(1215) << "neworder has " << newOrder.count()
-                     << " and plot colors is " << d->plotColors.count() << endl;
+        kDebug() << "neworder has " << newOrder.count()
+                 << " and plot colors is " << d->plotColors.count();
         return;
     }
     foreach (QList<double> data, d->plotData) {
         if (newOrder.count() != data.count()) {
-            kDebug(1215) << "Serious problem in move sample.  plotdata[i] has "
-                         << data.count() << " and neworder has " << newOrder.count() << endl;
+            kDebug() << "Serious problem in move sample.  plotdata[i] has "
+                     << data.count() << " and neworder has " << newOrder.count();
         } else {
             QList<double> newPlot;
             for (int i = 0; i < newOrder.count(); i++) {