[Kdenlive-devel] [PATCH 36/37] Compare with isEmpty() instead of null string ""

Mikko Rapeli mikko.rapeli at iki.fi
Thu Jun 28 13:53:14 UTC 2012


Fixes krazy warnings:

Check for QString compares to "" [emptystrcompare]...OOPS! 5 issues found!
src/titlewidget.cpp: line# 638 (1)
src/clipstabilize.cpp: line# 236 (1)
src/jogaction.cpp: line# 77 (1)
src/unicodedialog.cpp: line# 83 (1)
src/jogshuttleconfig.cpp: line# 67 (1)
Do not compare a QString to "". Instead use the .isEmpty() method. For example, if(str == "") becomes if(str.isEmpty())
---
 src/clipstabilize.cpp    |    2 +-
 src/jogaction.cpp        |    2 +-
 src/jogshuttleconfig.cpp |    2 +-
 src/titlewidget.cpp      |    2 +-
 src/unicodedialog.cpp    |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/clipstabilize.cpp b/src/clipstabilize.cpp
index cc741b2..fcae509 100644
--- a/src/clipstabilize.cpp
+++ b/src/clipstabilize.cpp
@@ -233,7 +233,7 @@ void ClipStabilize::slotUpdateParams()
     for (int i=0;i<vbox->count();i++){
         QWidget* w=vbox->itemAt(i)->widget();
         QString name=w->objectName();
-        if (name !="" && m_ui_params.contains(name)){
+        if (!name.isEmpty() && m_ui_params.contains(name)){
             if (m_ui_params[name]["type"]=="int" || m_ui_params[name]["type"]=="double"){
                 DoubleParameterWidget *dbl=(DoubleParameterWidget*)w;
                 m_ui_params[name]["value"]=QString::number((double)(dbl->getValue()));
diff --git a/src/jogaction.cpp b/src/jogaction.cpp
index 646cc9f..13bbb20 100644
--- a/src/jogaction.cpp
+++ b/src/jogaction.cpp
@@ -74,7 +74,7 @@ void JogShuttleAction::slotShuttlePos(int shuttle_pos)
 
 void JogShuttleAction::slotButton(int button_id)
 {
-    if (button_id >= m_actionMap.size() || m_actionMap[button_id] == "") {
+    if (button_id >= m_actionMap.size() || m_actionMap[button_id].isEmpty()) {
         // TODO(fleury): Shoudl this go to the status bar to inform the user ?
         fprintf(stderr, "Button %d has no action\n", button_id);
         return;
diff --git a/src/jogshuttleconfig.cpp b/src/jogshuttleconfig.cpp
index ddbaa85..fada730 100644
--- a/src/jogshuttleconfig.cpp
+++ b/src/jogshuttleconfig.cpp
@@ -64,7 +64,7 @@ QString JogShuttleConfig::actionMap(const QStringList& actionMap)
 {
   QStringList mappings;
   for (int i=0; i < actionMap.size(); ++i) {
-      if (actionMap[i] == "")
+      if (actionMap[i].isEmpty())
           continue;
       mappings << QString("%1%2%3%4").arg(BUTTON_PREFIX).arg(i).arg(KEY_VALUE_SEP).arg(actionMap[i]);
   }
diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 455471b..3c0f067 100644
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -635,7 +635,7 @@ void TitleWidget::refreshTitleTemplates()
 void TitleWidget::templateIndexChanged(int index)
 {
     QString item = templateBox->itemData(index).toString();
-    if (item != "") {
+    if (!item.isEmpty()) {
         if (lastDocumentHash != QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex()) {
             if (KMessageBox::questionYesNo(this, i18n("Do you really want to load a new template? Changes in this title will be lost!")) == KMessageBox::No) return;
         }
diff --git a/src/unicodedialog.cpp b/src/unicodedialog.cpp
index 9d3c0cd..51d462d 100644
--- a/src/unicodedialog.cpp
+++ b/src/unicodedialog.cpp
@@ -80,7 +80,7 @@ bool UnicodeDialog::controlCharacter(QString text)
 
     switch (inputMethod) {
     case InputHex:
-        if (t == ""
+        if (t.isEmpty()
                 || (t.length() == 1 && !(t == "9" || t == "a" || t == "d"))
                 || (t.length() == 2 && t.at(0) == QChar('1'))) {
             isControlCharacter = true;
-- 
1.7.10.4





More information about the Kdenlive mailing list