Release version 0.7-0

[vicar] / src / vicar-utils / cpp / main.cpp

diff --git a/src/vicar-utils/cpp/main.cpp b/src/vicar-utils/cpp/main.cpp
index 9f4af57..2f5c828 100755 (executable)
--- a/src/vicar-utils/cpp/main.cpp
+++ b/src/vicar-utils/cpp/main.cpp
@@ -45,17 +45,16 @@ int main(int argc, char *argv[])
     //qDBusRegisterMetaType<org::maemo::vicar::Profile>();
     //qDBusRegisterMetaType<org::maemo::vicar::ProfileList>();
 
-    TelepathyUtility *tpUtility = new TelepathyUtility();
-    DatabaseUtility *databaseUtility = new DatabaseUtility();
-    HarmattanAccountUtility *accountUtility = new HarmattanAccountUtility();
+    TelepathyUtility tpUtility;
+    DatabaseUtility databaseUtility;
 
     if (argc > 1 && argv[1]){
         QString instruction = QString(argv[1]);
         if (instruction == "INSTALL"){
             //Check if Account already exists                                                            
-            if (!tpUtility->accountExists()){
+            if (!tpUtility.accountExists()){
                 qDebug() << "VICaR account not found. Creating ..";
-                bool result = tpUtility->createAccount();
+                bool result = tpUtility.createAccount();
                 if (!result) exit(1);
             }
             else{
@@ -63,41 +62,41 @@ int main(int argc, char *argv[])
             }
         }
         else if (instruction == "REMOVE"){
-            bool result = tpUtility->deleteAccount();
+            bool result = tpUtility.deleteAccount();
             if (!result) exit(2);
         }
         else if (instruction == "TESTING"){
-            tpUtility->callNumberWithRing(argv[2]);
+            tpUtility.callNumberWithRing(argv[2]);
         }
         else if (instruction == "TPACCOUNTSTATUS"){
-            QString status = tpUtility->getAccountStatus();
+            QString status = tpUtility.getAccountStatus();
             qDebug() << "Account Status is "<< status;
         }
 #if defined(Q_WS_MAEMO_5)
         else if (instruction == "CREATEDB"){
-            bool result = databaseUtility->openDatabase();
+            bool result = databaseUtility.openDatabase();
             if (!result){
                 qDebug() <<"Error creating vicar database. "
-                        <<databaseUtility->lastError();
+                        <<databaseUtility.lastError();
                 exit(3);
             }
 
             qDebug() << "VICaR database opened.";
             qDebug() << "Preparing VICaR tables..";
-            result = databaseUtility->prepareTables();
+            result = databaseUtility.prepareTables();
             if (!result){
                 qDebug() <<"Error creating tables. "
-                        <<databaseUtility->lastError();
+                        <<databaseUtility.lastError();
                 exit(4);
             }
 
-            databaseUtility->closeDatabase();
+            databaseUtility.closeDatabase();
         }
         else if (instruction == "DROPDB"){
-            bool result = databaseUtility->deleteDatabase();
+            bool result = databaseUtility.deleteDatabase();
             if (!result){
                 qDebug() <<"Error deleting vicar database. "
-                        <<databaseUtility->lastError();
+                        <<databaseUtility.lastError();
                 exit(5);
             }
             qDebug() << "VICaR database deleted.";
@@ -105,11 +104,13 @@ int main(int argc, char *argv[])
 #elif defined(Q_WS_MAEMO_6)
         else if (instruction == "--create-account"){
             qDebug() << "Creating account";
-            accountUtility->addAccount();
+            HarmattanAccountUtility accountUtility;
+            accountUtility.addAccount();
         }
         else if (instruction == "--delete-account"){
             qDebug() << "Deleting account";
-            accountUtility->removeAccount();
+            HarmattanAccountUtility accountUtility;
+            accountUtility.removeAccount();
         }
 #endif
         else {
@@ -121,10 +122,4 @@ int main(int argc, char *argv[])
         qDebug() << QCryptographicHash::hash("VICaR",QCryptographicHash::Md5).toHex();
 
     }
-    delete (tpUtility);
-    delete (databaseUtility);
-    delete (accountUtility);
-    tpUtility = 0;
-    databaseUtility = 0;
-    accountUtility = 0;
 }