diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-05-10 21:37:18 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-11 01:57:00 -0700 |
| commit | cf848e52330fa0bca2ccc0fb5de5f2a4033fbafa (patch) | |
| tree | 7801e74e8ecc0be25849993294154c8322bd42b8 /qt-ui | |
| parent | 3b7624ff464b323fc3c271787a36faa1e97a7b27 (diff) | |
| download | subsurface-cf848e52330fa0bca2ccc0fb5de5f2a4033fbafa.tar.gz | |
Correct the usage of std::string and QString
QStrings shouldn't be == "" to check for empty string, use .isEmpty()
QStrings shouldn't be != "" to check for non empty, use .size()
std::string shouldn't be cleared with = "", use .clear()
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/exif.cpp | 18 | ||||
| -rw-r--r-- | qt-ui/globe.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/usermanual.cpp | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/qt-ui/exif.cpp b/qt-ui/exif.cpp index 2614d52e6..82601577f 100644 --- a/qt-ui/exif.cpp +++ b/qt-ui/exif.cpp @@ -525,15 +525,15 @@ int EXIFInfo::parseFromEXIFSegment(const unsigned char *buf, unsigned len) void EXIFInfo::clear() { // Strings - ImageDescription = ""; - Make = ""; - Model = ""; - Software = ""; - DateTime = ""; - DateTimeOriginal = ""; - DateTimeDigitized = ""; - SubSecTimeOriginal = ""; - Copyright = ""; + ImageDescription.clear(); + Make.clear(); + Model.clear(); + Software.clear(); + DateTime.clear(); + DateTimeOriginal.clear(); + DateTimeDigitized.clear(); + SubSecTimeOriginal.clear(); + Copyright.clear(); // Shorts / unsigned / double ByteAlign = 0; diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index 9f66e2bd1..1101500d3 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -48,11 +48,11 @@ GlobeGPS::GlobeGPS(QWidget *parent) : MarbleWidget(parent), QDir marble; if (!list.contains("earth/googlesat/googlesat.dgml")) { subsurfaceDataPath = getSubsurfaceDataPath("marbledata"); - if (subsurfaceDataPath != "") { + if (subsurfaceDataPath.size()) { MarbleDirs::setMarbleDataPath(subsurfaceDataPath); } else { subsurfaceDataPath = getSubsurfaceDataPath("data"); - if (subsurfaceDataPath != "") + if (subsurfaceDataPath.size()) MarbleDirs::setMarbleDataPath(subsurfaceDataPath); } } diff --git a/qt-ui/usermanual.cpp b/qt-ui/usermanual.cpp index 89e556d60..0dd39af33 100644 --- a/qt-ui/usermanual.cpp +++ b/qt-ui/usermanual.cpp @@ -30,7 +30,7 @@ UserManual::UserManual(QWidget *parent) : QMainWindow(parent), ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks); QString searchPath = getSubsurfaceDataPath("Documentation"); - if (searchPath != "") { + if (searchPath.size()) { QUrl url(searchPath.append("/user-manual.html")); ui->webView->setUrl(url); } else { |