From 47562aa1e837678182a64a634201b056fced9b33 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Thu, 12 Aug 2010 19:46:58 +0200
Subject: [PATCH] Maemo: Polish class interface.
---
.../qt-maemo/maemodeviceconfigurations.cpp | 4 ++--
.../qt4projectmanager/qt-maemo/maemodeviceconfigurations.h | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
index 1afc132ae21..54853ebe4b8 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
@@ -139,14 +139,14 @@ private:
{
const int startPort = parsePort();
if (atEnd() || nextChar() != '-') {
- m_portList.addRange(MaemoPortList::Range(startPort, startPort));
+ m_portList.addPort(startPort);
return;
}
++m_pos;
const int endPort = parsePort();
if (endPort < startPort)
throw ParseException("Invalid range (end < start).");
- m_portList.addRange(MaemoPortList::Range(startPort, endPort));
+ m_portList.addRange(startPort, endPort);
}
int parsePort()
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
index 6839893677c..9b0d27c55ff 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
@@ -51,9 +51,12 @@ namespace Internal {
class MaemoPortList
{
-public:
typedef QPair<int, int> Range;
- void addRange(const Range &range) { m_ranges << range; }
+public:
+ void addPort(int port) { addRange(port, port); }
+ void addRange(int startPort, int endPort) {
+ m_ranges << Range(startPort, endPort);
+ }
bool hasMore() const { return !m_ranges.isEmpty(); }
int count() const {
int n = 0;
--
GitLab