plasma: remove qrc support leftovers

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

plasma/containmentactionspluginsconfig.cpp

@@ -30,8 +30,6 @@
 
 #include "containmentactions.h"
 
-using namespace Plasma;
-
 namespace Plasma
 {
 

plasma/corona.cpp

@@ -51,8 +51,6 @@
 #include "private/containment_p.h"
 #include "tooltipmanager.h"
 
-using namespace Plasma;
-
 namespace Plasma
 {
 

plasma/private/tooltip.cpp

@@ -137,16 +137,17 @@ private:
 
 class ToolTipPrivate
 {
-    public:
+public:
-        ToolTipPrivate()
+    ToolTipPrivate()
         : text(nullptr),
-          imageWidget(nullptr),
+        imageWidget(nullptr),
-          preview(nullptr),
+        preview(nullptr),
-          background(nullptr),
+        background(nullptr),
-          animation(nullptr),
+        animation(nullptr),
-          direction(Plasma::Up),
+        direction(Plasma::Up),
-          autohide(true)
+        autohide(true)
-    { }
+    {
+    }
 
     TipTextWidget *text;
     KPixmapWidget *imageWidget;

plasma/view.cpp

@@ -31,8 +31,6 @@
 #include "private/containment_p.h"
 #include "wallpaper.h"
 
-using namespace Plasma;
-
 namespace Plasma
 {
 

plasma/widgets/checkbox.cpp

@@ -37,7 +37,7 @@ class CheckBoxPrivate : public ThemedWidgetInterface<CheckBox>
 public:
     CheckBoxPrivate(CheckBox *c)
         : ThemedWidgetInterface<CheckBox>(c),
-          svg(0)
+          svg(nullptr)
     {
     }
 
@@ -50,7 +50,7 @@ public:
     {
         if (imagePath.isEmpty()) {
             delete svg;
-            svg = 0;
+            svg = nullptr;
             return;
         }
 
@@ -69,7 +69,7 @@ public:
             svg->paint(&p, pm.rect());
         } else {
             delete svg;
-            svg = 0;
+            svg = nullptr;
             pm = QPixmap(absImagePath);
         }
 
@@ -116,17 +116,13 @@ void CheckBox::setImage(const QString &path)
     }
 
     delete d->svg;
-    d->svg = 0;
+    d->svg = nullptr;
     d->imagePath = path;
 
-    bool absolutePath = !path.isEmpty() &&
+    const bool absolutePath = (!path.isEmpty() && path[0] == '/');
-                            (path[0] == '/' || path.startsWith(QLatin1String(":/")))
-        ;
-
     if (absolutePath) {
         d->absImagePath = path;
     } else {
-        //TODO: package support
         d->absImagePath = Theme::defaultTheme()->imagePath(path);
     }
 

plasma/widgets/flashinglabel.cpp

@@ -35,9 +35,10 @@
 #include <plasma/animations/animation.h>
 #include <plasma/theme.h>
 
-using namespace Plasma;
+namespace Plasma
+{
 
-class Plasma::FlashingLabelPrivate
+class FlashingLabelPrivate
 {
     public:
         enum FlashingLabelType {
@@ -326,4 +327,6 @@ void FlashingLabelPrivate::setPalette()
     q->update();
 }
 
+} // namespace Plasma
+
 #include "moc_flashinglabel.cpp"

plasma/widgets/frame.cpp

@@ -164,14 +164,10 @@ void Frame::setImage(const QString &path)
     delete d->pixmap;
     d->pixmap = 0;
 
-    bool absolutePath = !path.isEmpty() &&
+    const bool absolutePath = (!path.isEmpty() && path[0] == '/');
-                            (path[0] == '/' || path.startsWith(QLatin1String(":/")))
-        ;
-
     if (absolutePath) {
         d->absImagePath = path;
     } else {
-        //TODO: package support
         d->absImagePath = Theme::defaultTheme()->imagePath(path);
     }
 

plasma/widgets/label.cpp

@@ -43,7 +43,7 @@ class LabelPrivate : public ThemedWidgetInterface<Label>
 public:
     LabelPrivate(Label *label)
         : ThemedWidgetInterface<Label>(label),
-          svg(0),
+          svg(nullptr),
           textSelectable(false),
           hasLinks(false)
     {
@@ -58,7 +58,7 @@ public:
     {
         if (imagePath.isEmpty()) {
             delete svg;
-            svg = 0;
+            svg = nullptr;
             return;
         }
 
@@ -77,7 +77,7 @@ public:
             svg->paint(&p, pm.rect());
         } else {
             delete svg;
-            svg = 0;
+            svg = nullptr;
             pm = QPixmap(absImagePath);
         }
 
@@ -87,8 +87,8 @@ public:
     QString imagePath;
     QString absImagePath;
     Svg *svg;
-    bool textSelectable : 1;
+    bool textSelectable;
-    bool hasLinks : 1;
+    bool hasLinks;
 };
 
 Label::Label(QGraphicsWidget *parent)
@@ -133,17 +133,13 @@ void Label::setImage(const QString &path)
     }
 
     delete d->svg;
-    d->svg = 0;
+    d->svg = nullptr;
     d->imagePath = path;
 
-    bool absolutePath = !path.isEmpty() &&
+    const bool absolutePath = (!path.isEmpty() && path[0] == '/');
-                            (path[0] == '/' || path.startsWith(QLatin1String(":/")))
-        ;
-
     if (absolutePath) {
         d->absImagePath = path;
     } else {
-        //TODO: package support
         d->absImagePath = Theme::defaultTheme()->imagePath(path);
     }
 

plasma/widgets/pushbutton.cpp

@@ -45,7 +45,7 @@ class PushButtonPrivate : public ActionWidgetInterface<PushButton>
 public:
     PushButtonPrivate(PushButton *pushButton)
         : ActionWidgetInterface<PushButton>(pushButton),
-          svg(0)
+          svg(nullptr)
     {
     }
 
@@ -58,7 +58,7 @@ public:
     {
         if (imagePath.isEmpty()) {
             delete svg;
-            svg = 0;
+            svg = nullptr;
             return;
         }
 
@@ -91,7 +91,7 @@ public:
             }
         } else {
             delete svg;
-            svg = 0;
+            svg = nullptr;
             pm = QPixmap(absImagePath);
         }
 
@@ -147,17 +147,13 @@ void PushButton::setImage(const QString &path)
     }
 
     delete d->svg;
-    d->svg = 0;
+    d->svg = nullptr;
     d->imagePath = path;
 
-    bool absolutePath = !path.isEmpty() &&
+    const bool absolutePath = (!path.isEmpty() && path[0] == '/');
-                            (path[0] == '/' || path.startsWith(QLatin1String(":/")))
-        ;
-
     if (absolutePath) {
         d->absImagePath = path;
     } else {
-        //TODO: package support
         d->absImagePath = Theme::defaultTheme()->imagePath(path);
     }
 

plasma/widgets/radiobutton.cpp

@@ -37,7 +37,7 @@ class RadioButtonPrivate : public ThemedWidgetInterface<RadioButton>
 public:
     RadioButtonPrivate(RadioButton *radio)
         : ThemedWidgetInterface<RadioButton>(radio),
-         svg(0)
+         svg(nullptr)
     {
     }
 
@@ -105,17 +105,13 @@ void RadioButton::setImage(const QString &path)
     }
 
     delete d->svg;
-    d->svg = 0;
+    d->svg = nullptr;
     d->imagePath = path;
 
-    bool absolutePath = !path.isEmpty() &&
+    const bool absolutePath = (!path.isEmpty() && path[0] == '/');
-                            (path[0] == '/' || path.startsWith(QLatin1String(":/")))
-        ;
-
     if (absolutePath) {
         d->absImagePath = path;
     } else {
-        //TODO: package support
         d->absImagePath = Theme::defaultTheme()->imagePath(path);
     }
 

plasma/widgets/toolbutton.cpp

@@ -45,8 +45,8 @@ class ToolButtonPrivate : public ActionWidgetInterface<ToolButton>
 public:
     ToolButtonPrivate(ToolButton *toolButton)
         : ActionWidgetInterface<ToolButton>(toolButton),
-          background(0),
+          background(nullptr),
-          svg(0),
+          svg(nullptr),
           underMouse(false)
     {
     }
@@ -60,7 +60,7 @@ public:
     {
         if (imagePath.isEmpty()) {
             delete svg;
-            svg = 0;
+            svg = nullptr;
             return;
         }
 
@@ -91,7 +91,7 @@ public:
             }
         } else {
             delete svg;
-            svg = 0;
+            svg = nullptr;
             pm = QPixmap(absImagePath);
         }
 
@@ -236,17 +236,13 @@ void ToolButton::setImage(const QString &path)
     }
 
     delete d->svg;
-    d->svg = 0;
+    d->svg = nullptr;
     d->imagePath = path;
 
-    bool absolutePath = !path.isEmpty() &&
+    const bool absolutePath = (!path.isEmpty() && path[0] == '/');
-                            (path[0] == '/' || path.startsWith(QLatin1String(":/")))
-        ;
-
     if (absolutePath) {
         d->absImagePath = path;
     } else {
-        //TODO: package support
         d->absImagePath = Theme::defaultTheme()->imagePath(path);
     }
 

plasma/widgets/widget.cpp.template

@@ -35,7 +35,7 @@ class <Name>Private
 public:
     <Name>Private(<Name> *w)
         : q(w),
-          svg(0)
+          svg(nullptr)
     {
     }
 
@@ -48,7 +48,7 @@ public:
     {
         if (imagePath.isEmpty()) {
             delete svg;
-            svg = 0;
+            svg = nullptr;
             return;
         }
 
@@ -67,7 +67,7 @@ public:
             svg->paint(&p, pm.rect());
         } else {
             delete svg;
-            svg = 0;
+            svg = nullptr;
             pm = QPixmap(absImagePath);
         }
 
@@ -115,15 +115,13 @@ void <Name>::setImage(const QString &path)
     }
 
     delete d->svg;
-    d->svg = 0;
+    d->svg = nullptr;
     d->imagePath = path;
 
-    bool absolutePath = !path.isEmpty() && (path[0] == '/' || path.startsWith(":/"));
+    const bool absolutePath = (!path.isEmpty() && path[0] == '/');
-
     if (absolutePath) {
         d->absImagePath = path;
     } else {
-        //TODO: package support
         d->absImagePath = Theme::defaultTheme()->imagePath(path);
     }