Branch: master

6213a065 2014-08-04 19:09:02 Timothy Pearson
Clean up a couple of build warnings
M common/config_file.c
M config/qtcurveconfig.cpp
diff --git a/common/config_file.c b/common/config_file.c
index aa1c289..91a9108 100644
--- a/common/config_file.c
+++ b/common/config_file.c
@@ -964,12 +964,8 @@
 
 static void readDoubleList(TQtCConfig &cfg, const char *key, double *list, int count)
 {
-#if ( (0x039999 >= 0x040000))
-    TQStringList strings(readStringEntry(cfg, key).split(',', TQString::SkipEmptyParts));
-#else
     TQStringList strings(TQStringList::split(',', readStringEntry(cfg, key)));
-#endif
-    bool ok(count==strings.size());
+    bool ok(count==(int)strings.size());
 
     if(ok)
     {
diff --git a/config/qtcurveconfig.cpp b/config/qtcurveconfig.cpp
index 4eccf69..64ffcae 100644
--- a/config/qtcurveconfig.cpp
+++ b/config/qtcurveconfig.cpp
@@ -1137,15 +1137,17 @@
         double                           pos(stopPosition->value()/100.0),
                                          val(stopValue->value()/100.0);
 
-        for(; it!=end; ++it)
-            if(equal(pos, (*it).pos))
-                if(equal(val, (*it).val))
+        for(; it!=end; ++it) {
+            if(equal(pos, (*it).pos)) {
+                if(equal(val, (*it).val)) {
                     return;
-                else
-                {
+                }
+                else {
                     (*cg).second.stops.erase(it);
                     break;
                 }
+            }
+        }
 
         unsigned int b4=(*cg).second.stops.size();
         (*cg).second.stops.insert(GradientStop(pos, val));
9781c41e 2014-08-07 13:04:37 Timothy Pearson
Very minor style cleanup
M style/qtcurve.cpp
diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp
index a489e38..32601ea 100644
--- a/style/qtcurve.cpp
+++ b/style/qtcurve.cpp
@@ -5243,8 +5243,9 @@
             {
                 drawMenuOrToolBarBackground(p, r, cg, false, TQt::Horizontal==ceData.orientation);
             }
-            else
+            else {
                 BASE_STYLE::drawControl(control, p, ceData, elementFlags, r, cg, flags, data, widget);
+            }
             break;
         case CE_ProgressBarGroove:
         {