generic: misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/kdeplasma-addons/applets/lancelot/application/LancelotWindow.cpp b/kdeplasma-addons/applets/lancelot/application/LancelotWindow.cpp
index 94a22e0..1b3f290 100644 (file)
--- a/kdeplasma-addons/applets/lancelot/application/LancelotWindow.cpp
+++ b/kdeplasma-addons/applets/lancelot/application/LancelotWindow.cpp
@@ -1128,7 +1128,7 @@ void LancelotWindow::configureMenu()
         return;
     }
 
-    KConfigSkeleton * nullManager = new KConfigSkeleton(0);
+    KConfigSkeleton * nullManager = new KConfigSkeleton();
     dialog = new KConfigDialog(this, dialogID, nullManager);
     dialog->setFaceType(KPageDialog::Auto);
     dialog->setWindowTitle(i18n("Configure Lancelot menu"));

diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/abstractgroup.cpp b/kdeplasma-addons/containments/groupingdesktop/lib/abstractgroup.cpp
index dac9cb0..ff35af4 100644 (file)
--- a/kdeplasma-addons/containments/groupingdesktop/lib/abstractgroup.cpp
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/abstractgroup.cpp
@@ -783,7 +783,7 @@ void AbstractGroup::showConfigurationInterface()
         return;
     }
 
-    KConfigSkeleton *nullManager = new KConfigSkeleton(0);
+    KConfigSkeleton *nullManager = new KConfigSkeleton();
     KConfigDialog *dialog = new KConfigDialog(0, d->configDialogId(), nullManager);
     dialog->setFaceType(KPageDialog::Auto);
     dialog->setWindowTitle(i18n("Group Configuration"));

diff --git a/libkscreen/src/output.cpp b/libkscreen/src/output.cpp
index 36e5f68..8514ed6 100644 (file)
--- a/libkscreen/src/output.cpp
+++ b/libkscreen/src/output.cpp
@@ -108,7 +108,7 @@ QString Output::Private::biggestMode(const ModeList& modes) const
     }
 
     if (!biggest) {
-        return 0;
+        return QString();
     }
 
     return biggest->id();

diff --git a/okular/generators/ooo/converter.cpp b/okular/generators/ooo/converter.cpp
index 086c51b..516459c 100644 (file)
--- a/okular/generators/ooo/converter.cpp
+++ b/okular/generators/ooo/converter.cpp
@@ -252,7 +252,7 @@ bool Converter::convertHeader( QTextCursor *cursor, const QDomElement &element )
     child = child.nextSibling();
   }
 
-  emit addTitle( element.attribute( "outline-level", 0 ).toInt(), element.text(), cursor->block() );
+  emit addTitle( element.attribute( "outline-level", QString("0") ).toInt(), element.text(), cursor->block() );
 
   return true;
 }

diff --git a/partitionmanager/src/core/smartattribute.cpp b/partitionmanager/src/core/smartattribute.cpp
index 42d3135..97e28b7 100644 (file)
--- a/partitionmanager/src/core/smartattribute.cpp
+++ b/partitionmanager/src/core/smartattribute.cpp
@@ -173,7 +173,7 @@ static const AttrDetails* attrDetails()
                { 242,  i18nc("SMART attr name", "Total LBAs Read"), i18nc("SMART attr description", "Total LBAs Read")  },
                { 250,  i18nc("SMART attr name", "Read Error Retry Rate"), i18nc("SMART attr description", "Number of errors while reading from a disk")  },
                { 254,  i18nc("SMART attr name", "Free Fall Protection"), i18nc("SMART attr description", "Number of "Free Fall Events" detected") },
-               { -1, NULL, NULL }
+               { -1, QString(), QString() }
        };
 
        return details;

diff --git a/yakuake/app/sessionstack.h b/yakuake/app/sessionstack.h
index c0e5813..5e4a4fa 100644 (file)
--- a/yakuake/app/sessionstack.h
+++ b/yakuake/app/sessionstack.h
@@ -113,7 +113,7 @@ class SessionStack : public QStackedWidget
 
 
     signals:
-        void sessionAdded(int sessionId, const QString& title = 0);
+        void sessionAdded(int sessionId, const QString& title = QString());
         void sessionRaised(int sessionId);
         void sessionRemoved(int sessionId);
 

diff --git a/yakuake/app/tabbar.h b/yakuake/app/tabbar.h
index 8c26d1a..0c7709a 100644 (file)
--- a/yakuake/app/tabbar.h
+++ b/yakuake/app/tabbar.h
@@ -52,7 +52,7 @@ class TabBar : public QWidget
 
 
     public slots:
-        void addTab(int sessionId, const QString& title = 0);
+        void addTab(int sessionId, const QString& title = QString());
         void removeTab(int sessionId = -1);
 
         void interactiveRename(int sessionId);