Merge pull request #3 from BurrrY/master

Fix gameList to Pointer

Author: BurrrY

fusioncli.cpp

@@ -10,19 +10,19 @@ FusionCLI::FusionCLI(QObject *parent) : QObject(parent)
 }
 
 
-void FusionCLI::execute(int argc, char *argv[]) {
+void FusionCLI::execute(int argc, QStringList args) {
 
-    if(argc>1)
+   if(argc>1)
    {
-       QString arg = argv[1];
+       QString arg = args[1];
        if(arg=="-g"||arg=="--allGames")
            getAllGames();
        else if(arg=="-r"||arg=="--refresh")
            refreshList();
        else if(arg=="-l"||arg=="--launch")
-           launchByID(QString(argv[2]));
+           launchByID(args[2]);
        else if(arg=="-i"||arg=="--gameInfo") {
-           getGameByID(QString(argv[2]));
+           getGameByID(args[2]);
        }
    }
 }
@@ -87,7 +87,7 @@ void FusionCLI::getAllGames() {
     qDebug() << "Found " << gameList.length() << " games.";
 
     for(int i=0;i<gameList.length();++i) {
-       games.append(getGame(&gameList[i]));
+       games.append(getGame(gameList[i]));
     }
 
 

fusioncli.h

@@ -15,7 +15,7 @@ class FusionCLI : public QObject
     Q_OBJECT
 public:
     explicit FusionCLI(QObject *parent = 0);
-    void execute(int argc, char *argv[]);
+    void execute(int argc, QStringList args);
     void refreshList();
     void launchByID(QString ID);
 signals:
@@ -30,7 +30,7 @@ public slots:
     void print(QList<QVariant> list, QString title);
     void print(QVariant list);
     QTextStream *q;
-    QList<FGame> gameList;
+    QList<FGame*> gameList;
     void getGameByID(QString ID);
 };
 

main.cpp

@@ -74,29 +74,30 @@ int main(int argc, char *argv[])
 
     qDebug() << "Args " <<args;
 
-
-
     if(argc<=1) {
-       qout << "Fusion Commandline-Interface"<< endl <<endl;
-       qout << "Usage: fusioncli [options]"<< endl;
-       qout << "--allGames -g: Get all Games with all Info"<< endl<<endl;
+       qout << "Fusion Commandline-Interface" << endl <<endl;
+       qout << "Usage: fusioncli [options]" << endl;
+       qout << "--allGames      | -g     : Get all Games with all Info" << endl;
+       qout << "--refresh       | -r     : Refresh Infos from Database" << endl;
+       qout << "--launch [ID]   | -l [ID]: Launch Game with ID" << endl;
+       qout << "--gameInfo [ID] | -i [ID]: Get info for Game-ID" << endl << endl;
+
 
        QTimer::singleShot(10, &a, SLOT(quit()));
         #ifdef DEBUG_TEST
        dbgFile.close();
        delete dbgStream;
         #endif
-    }
-
-    FusionCLI cli;
-    cli.execute(argc, argv);
+    } else {
+        FusionCLI cli;
+        cli.execute(argc, args);
 
-    QTimer::singleShot(10, &a, SLOT(quit()));
-
-    #ifdef DEBUG_TEST
-    dbgFile.close();
-    delete dbgStream;
-    #endif
+        QTimer::singleShot(10, &a, SLOT(quit()));
 
+        #ifdef DEBUG_TEST
+        dbgFile.close();
+        delete dbgStream;
+        #endif
+    }
     return a.exec();
 }