diff options
| author | John Fultz <jfultz@wolfram.com> | 2017-08-02 00:21:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 00:21:40 -0500 |
| commit | 6684280feec74fa4c58066cf8e667b5f19a717c7 (patch) | |
| tree | 6fa1e702d41eaac6e985f4e6adc1e0574f0574e5 /quackleio | |
| parent | 9593f48793d6a11617de47a96c282f9ddb153cd5 (diff) | |
| parent | a91130890c24612fd4c1fba0fabce5723ffe78d4 (diff) | |
Merge pull request #37 from gokceneraslan/qt55
Port quackle to Qt 5.5
Diffstat (limited to 'quackleio')
| -rw-r--r-- | quackleio/froggetopt.cpp | 16 | ||||
| -rw-r--r-- | quackleio/froggetopt.h | 1 | ||||
| -rw-r--r-- | quackleio/quackleio.pro | 2 | ||||
| -rw-r--r-- | quackleio/util.cpp | 4 |
4 files changed, 18 insertions, 5 deletions
diff --git a/quackleio/froggetopt.cpp b/quackleio/froggetopt.cpp index 68f20fe..9131ecc 100644 --- a/quackleio/froggetopt.cpp +++ b/quackleio/froggetopt.cpp @@ -130,7 +130,7 @@ GetOpt::GetOpt() if ( !QCoreApplication::instance() ) qFatal( "GetOpt: requires a QApplication instance to be constructed first" ); - init( QCoreApplication::instance()->argc(), QCoreApplication::instance()->argv(), 1 ); + init( QCoreApplication::instance()->arguments(), 1 ); } /** @@ -141,7 +141,7 @@ GetOpt::GetOpt( int offset ) if ( !QCoreApplication::instance() ) qFatal( "GetOpt: requires a QApplication instance to be constructed first" ); - init( QCoreApplication::instance()->argc(), QCoreApplication::instance()->argv(), offset ); + init( QCoreApplication::instance()->arguments(), offset ); } /** @@ -178,6 +178,18 @@ GetOpt::GetOpt( int argc, char *argv[] ) init( 0, 0 ); } +void GetOpt::init( const QStringList &argv, int offset ) +{ + numReqArgs = numOptArgs = 0; + currArg = 1; // appname is not part of the arguments + + // application name + aname = QFileInfo( argv[0] ).fileName(); + + for ( int i = offset; i < argv.size(); ++i ) + args.append( argv[i] ); +} + /** \internal */ diff --git a/quackleio/froggetopt.h b/quackleio/froggetopt.h index 7376dd4..895dd9e 100644 --- a/quackleio/froggetopt.h +++ b/quackleio/froggetopt.h @@ -103,6 +103,7 @@ private: QMap<QString, int> setOptions; void init( int argc, char *argv[], int offset = 1 ); + void init( const QStringList &argv, int offset = 1 ); void addOption( Option o ); void setSwitch( const Option &o ); diff --git a/quackleio/quackleio.pro b/quackleio/quackleio.pro index b48f58b..9cff93c 100644 --- a/quackleio/quackleio.pro +++ b/quackleio/quackleio.pro @@ -21,7 +21,7 @@ CONFIG += release staticlib CONFIG -= x11 QMAKE_CXXFLAGS += -std=c++11 -QMAKE_CXXFLAGS:!win32-msvc2013 += -Wno-unknown-warning-option -Wno-deprecated-register +#QMAKE_CXXFLAGS:!win32-msvc2013 += -Wno-unknown-warning-option -Wno-deprecated-register # Input HEADERS += *.h diff --git a/quackleio/util.cpp b/quackleio/util.cpp index 774dcad..2fca766 100644 --- a/quackleio/util.cpp +++ b/quackleio/util.cpp @@ -149,12 +149,12 @@ QString Util::letterToQString(const Quackle::Letter &letter) string Util::qstringToStdString(const QString &qstring) { - return string(qstring.toAscii()); + return string(qstring.toLatin1()); } QString Util::stdStringToQString(const string &stdString) { - return QString::fromAscii(stdString.c_str()); + return QString::fromLatin1(stdString.c_str()); } Quackle::LetterString Util::alphagram(const Quackle::LetterString &word) |