summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2014-03-18 15:44:06 +0100
committerCaroline Chao <caroline.chao@digia.com>2014-03-24 08:42:57 +0100
commit074aeb63bc0f648bc8c65cc7b3609a1c826bc790 (patch)
treec35593d40cd4f7b81b95ec5125167b7109e2e245
parent54054b67d9672ec4ced58bc19ed449bb6c42a630 (diff)
Small fixes / cleanup
- Remove useless JS function - Use CONSTANT for constant properties Change-Id: Ie921852250f3f7df718d998e7b3d160dc7db6a15 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
-rw-r--r--qml/js/utils.js20
-rw-r--r--src/applicationinfo.cpp2
-rw-r--r--src/applicationinfo.h9
3 files changed, 6 insertions, 25 deletions
diff --git a/qml/js/utils.js b/qml/js/utils.js
index 69ab20c..2bf6907 100644
--- a/qml/js/utils.js
+++ b/qml/js/utils.js
@@ -271,23 +271,3 @@ function getWeatherUrl(index, dayModel, size)
smallUrl = smallUrl
return dayModel.getCachedImageFile(smallUrl)
}
-
-function getLongestShortDayName()
-{
- // Used to get the maximum short day length
- var longestDayName = ""
- for (var day = 0; day < 6; day++) {
- var temp = Qt.locale().dayName(day, QtQml.Locale.ShortFormat)
- if (temp.toString().length > longestDayName.toString().length)
- longestDayName = temp
- }
- return longestDayName
-}
-
-function getTodayShortDate()
-{
- // Used to get the short date format length
- var currentDate = new Date()
- return getShortDate(currentDate)
-}
-
diff --git a/src/applicationinfo.cpp b/src/applicationinfo.cpp
index 901f80e..cc9cec9 100644
--- a/src/applicationinfo.cpp
+++ b/src/applicationinfo.cpp
@@ -146,6 +146,8 @@ void ApplicationInfo::notifyPortraitMode(Qt::ScreenOrientation orientation)
case Qt::InvertedPortraitOrientation:
setIsPortraitMode(true);
break;
+ default:
+ break;
}
}
diff --git a/src/applicationinfo.h b/src/applicationinfo.h
index f8924b8..58d7c7b 100644
--- a/src/applicationinfo.h
+++ b/src/applicationinfo.h
@@ -64,11 +64,11 @@ class ApplicationInfo : public QObject
Q_PROPERTY(int currentIndexDay READ currentIndexDay WRITE setCurrentIndexDay NOTIFY currentIndexDayChanged)
Q_PROPERTY(CityModel *currentCityModel READ currentCityModel WRITE setCurrentCityModel NOTIFY currentCityModelChanged)
Q_PROPERTY(CitiesListModel *foundCities READ foundCities NOTIFY foundCitiesChanged)
- Q_PROPERTY(qreal ratio READ ratio NOTIFY ratioChanged)
+ Q_PROPERTY(qreal ratio READ ratio CONSTANT)
Q_PROPERTY(qreal hMargin READ hMargin NOTIFY hMarginChanged)
- Q_PROPERTY(qreal sliderHandleWidth READ sliderHandleWidth NOTIFY ratioChanged)
- Q_PROPERTY(qreal sliderHandleHeight READ sliderHandleHeight NOTIFY ratioChanged)
- Q_PROPERTY(qreal sliderGapWidth READ sliderGapWidth NOTIFY ratioChanged)
+ Q_PROPERTY(qreal sliderHandleWidth READ sliderHandleWidth CONSTANT)
+ Q_PROPERTY(qreal sliderHandleHeight READ sliderHandleHeight CONSTANT)
+ Q_PROPERTY(qreal sliderGapWidth READ sliderGapWidth CONSTANT)
public:
ApplicationInfo(WeatherImageProvider *provider);
@@ -116,7 +116,6 @@ signals:
void currentCityModelChanged();
void currentIndexDayChanged();
void foundCitiesChanged();
- void ratioChanged();
void waitForCitiesQueryReply(const QString message);
void errorOnQueryCities(const QString errorMessage);