compiler warnings fixes

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

diff --git a/src/core/io/qtemporaryfile.cpp b/src/core/io/qtemporaryfile.cpp
index d210a47..d1718f1 100644 (file)
--- a/src/core/io/qtemporaryfile.cpp
+++ b/src/core/io/qtemporaryfile.cpp
@@ -172,7 +172,7 @@ bool QTemporaryFileEngine::open(QIODevice::OpenMode openMode)
     static const char tmpnamechars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
     char *data = filename.data();
-    for (int i = 0; i < phLength; i++) {
+    for (uint i = 0; i < phLength; i++) {
         data[i + phPos] = tmpnamechars[qrand() % 52];
     }
 

diff --git a/src/designer/shared/pluginmanager.cpp b/src/designer/shared/pluginmanager.cpp
index b15d562..7ede6b2 100644 (file)
--- a/src/designer/shared/pluginmanager.cpp
+++ b/src/designer/shared/pluginmanager.cpp
@@ -122,7 +122,7 @@ QStringList QDesignerPluginManager::defaultPluginPaths()
 
 static inline QString getDesignerLanguage(QDesignerFormEditorInterface *core)
 {
-    if (QDesignerLanguageExtension *lang = qt_extension<QDesignerLanguageExtension *>(core->extensionManager(), core)) {
+    if (qt_extension<QDesignerLanguageExtension *>(core->extensionManager(), core)) {
         return QLatin1String("unknown");
     }
     return QLatin1String("c++");

diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp
index 65994e9..45ce9f3 100644 (file)
--- a/src/gui/image/qpixmapfilter.cpp
+++ b/src/gui/image/qpixmapfilter.cpp
@@ -541,10 +541,7 @@ static void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, bool qual
         radius *= qreal(0.5);
     }
 
-    if (alphaOnly)
-        expblur(blurImage, radius, quality, true);
-    else
-        expblur(blurImage, radius, quality, false);
+    expblur(blurImage, radius, quality, alphaOnly);
 
     if (p) {
         p->scale(scale, scale);
@@ -552,14 +549,6 @@ static void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, bool qual
     }
 }
 
-static void qt_blurImage(QImage &blurImage, qreal radius, bool quality)
-{
-    if (blurImage.format() == QImage::Format_Indexed8)
-        expblur(blurImage, radius, quality, true);
-    else
-        expblur(blurImage, radius, quality, false);
-}
-
 Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale);
 
 /*!

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index eb0c1ea..575c736 100644 (file)
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -958,17 +958,6 @@ static void getXDefault(const char *group, const char *key, int *val)
     }
 }
 
-static void getXDefault(const char *group, const char *key, double *val)
-{
-    char *str = XGetDefault(qt_x11Data->display, group, key);
-    if (str) {
-        bool ok;
-        double v = QByteArray(str).toDouble(&ok);
-        if (ok)
-            *val = v;
-    }
-}
-
 static void getXDefault(const char *group, const char *key, bool *val)
 {
     char *str = XGetDefault(qt_x11Data->display, group, key);