Mercurial > qtargs

changeset 7:49efa3ecaa98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjusted build in GCC to match changes made for VS to compile. TI: -
author John Schneiderman <JohnMS@CodeGNU.com>
date Tue, 17 Jun 2014 00:24:31 +0000
parents 1a17dc714510
children 1271d289ac61
files src/UNIT_TESTS/qargsut.pro src/qargs.cpp src/qargs.h src/qargs.pro
diffstat 4 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/src/UNIT_TESTS/qargsut.pro	Sat Jun 14 16:10:46 2014 +0000
+++ b/src/UNIT_TESTS/qargsut.pro	Tue Jun 17 00:24:31 2014 +0000
@@ -47,7 +47,7 @@
     linux-g++ {
 	   !buildpass:message(Setting GCC debug flags.)
 	   QMAKE_CXXFLAGS_DEBUG += \
-		  -std=c++98 \ # Conform to ISO standard
+		  -std=c++11 \ # Conform to ISO standard
 		  -pg \ # Enable code profiling
 		  -fstack-protector-all \ # Check for buffer overflows
 		  -Wall \ # Enable all normal code execution warnings
--- a/src/qargs.cpp	Sat Jun 14 16:10:46 2014 +0000
+++ b/src/qargs.cpp	Tue Jun 17 00:24:31 2014 +0000
@@ -22,10 +22,8 @@
 
 #include <QChar>
 #include <QString>
-#include <QCoreApplication>
 #include <QFileInfo>
 #include <QStringBuilder>
-#include <QDebug>
 #include <QList>
 
 #include <iostream>
@@ -342,7 +340,7 @@
 #ifdef Q_OS_WIN32
 	   valueTest = this->arguments_.at(longIndex + 1).toLower();
 #else
-	   valueTest = this->mArguments.at(longIndex).split(
+	   valueTest = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1].toLower();
 #endif
 
@@ -388,7 +386,7 @@
 #ifdef Q_OS_WIN32
 	   value = this->arguments_.at(longIndex + 1).toDouble(&converted);
 #else
-	   value = this->mArguments.at(longIndex).split(
+	   value = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1].toDouble(&converted);
 #endif
 
@@ -415,7 +413,7 @@
 #ifdef Q_OS_WIN32
 	   value = this->arguments_.at(longIndex + 1).toShort(&converted);
 #else
-	   value = this->mArguments.at(longIndex).split(
+	   value = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1].toShort(&converted);
 #endif
 
@@ -442,7 +440,7 @@
 #ifdef Q_OS_WIN32
 	   value = this->arguments_.at(longIndex + 1).toShort(&converted);
 #else
-	   value = this->mArguments.at(longIndex).split(
+	   value = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1].toShort(&converted);
 #endif
 
@@ -469,7 +467,7 @@
 #ifdef Q_OS_WIN32
 	   value = this->arguments_.at(longIndex + 1).toInt(&converted);
 #else
-	   value = this->mArguments.at(longIndex).split(
+	   value = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1].toInt(&converted);
 #endif
 
@@ -496,7 +494,7 @@
 #ifdef Q_OS_WIN32
 	   value = this->arguments_.at(longIndex + 1).toLongLong(&converted);
 #else
-	   value = this->mArguments.at(longIndex).split(
+	   value = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1].toLongLong(&converted);
 #endif
 
@@ -523,7 +521,7 @@
 #ifdef Q_OS_WIN32
 	   value = this->arguments_.at(longIndex + 1).toUShort(&converted);
 #else
-	   value = this->mArguments.at(longIndex).split(
+	   value = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1].toUShort(&converted);
 #endif
 
@@ -550,7 +548,7 @@
 #ifdef Q_OS_WIN32
 	   value = this->arguments_.at(longIndex + 1).toUShort(&converted);
 #else
-	   value = this->mArguments.at(longIndex).split(
+	   value = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1].toUShort(&converted);
 #endif
 
@@ -577,7 +575,7 @@
 #ifdef Q_OS_WIN32
 	   value = this->arguments_.at(longIndex + 1).toUInt(&converted);
 #else
-	   value = this->mArguments.at(longIndex).split(
+	   value = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1].toUInt(&converted);
 #endif
 
@@ -604,7 +602,7 @@
 #ifdef Q_OS_WIN32
 	   value = this->arguments_.at(longIndex + 1).toULongLong(&converted);
 #else
-	   value = this->mArguments.at(longIndex).split(
+	   value = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1].toULongLong(&converted);
 #endif
 
@@ -631,7 +629,7 @@
 #ifdef Q_OS_WIN32
 	   valueHolder = this->arguments_.at(longIndex + 1);
 #else
-	   valueHolder = this->mArguments.at(longIndex).split(
+	   valueHolder = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1];
 #endif
 
@@ -659,7 +657,7 @@
 #ifdef Q_OS_WIN32
 	   value = this->arguments_.at(longIndex + 1);
 #else
-	   value = this->mArguments.at(longIndex).split(
+	   value = this->arguments_.at(longIndex).split(
 			 ARGUMENT_LONG_ASSIGNMENT)[1];
 #endif
 
@@ -754,10 +752,10 @@
 			 ARGUMENT_MARKER).arg(supported_.value(name).longName)));
 #else
     // Unices long options form is: --long-index-name=value
-    index = (this->mArguments.indexOf(
+    index = (this->arguments_.indexOf(
 			  QRegExp(QString("%1%2%3%4.*").arg(
 					    ARGUMENT_MARKER).arg(ARGUMENT_MARKER).arg(
-					    this->mSupported.value(name).longName).arg(
+					    this->supported_.value(name).longName).arg(
 					    ARGUMENT_LONG_ASSIGNMENT))));
 #endif
 
--- a/src/qargs.h	Sat Jun 14 16:10:46 2014 +0000
+++ b/src/qargs.h	Tue Jun 17 00:24:31 2014 +0000
@@ -29,6 +29,8 @@
 #include <QObject>
 #include <QStringList>
 #include <QMap>
+#include <QDebug>
+#include <QCoreApplication>
 
 #include "qargs_global.h"
 
--- a/src/qargs.pro	Sat Jun 14 16:10:46 2014 +0000
+++ b/src/qargs.pro	Tue Jun 17 00:24:31 2014 +0000
@@ -43,7 +43,7 @@
     linux-g++ {
 	   !buildpass:message(Setting GCC debug flags.)
 	   QMAKE_CXXFLAGS_DEBUG += \
-		  -std=c++98 \ # Conform to ISO standard
+		  -std=c++11 \ # Conform to ISO standard
 		  -pg \ # Enable code profiling
 		  -fstack-protector-all \ # Check for buffer overflows
 		  -Wall \ # Enable all normal code execution warnings