fix: Windows path for database and default location when not specifying a path

Author: Fishwaldo

ozwadmin-main/main.cpp

@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
         }
         /* if we dont have a dbPath, Deploy our config files there */
         if (dbPath.isEmpty()) {
-#ifndef Q_OS_WIN
+#if 1
             qCWarning(ozwadmin) << "Configuration Database Does Not Exist - Copying Database to Location " << QFileInfo(parser.value(configDir).append("/")).absoluteFilePath();
             QStringList Locations;
             Locations << ".";
@@ -159,8 +159,7 @@ int main(int argc, char *argv[])
         }
         /* if we dont have a dbPath, Deploy our config files there */
         if (dbPath.isEmpty()) {
-#ifndef Q_OS_WIN
-            dbPath = QFileInfo("./").absoluteFilePath();
+            dbPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(0);
             qCWarning(ozwadmin) << "Configuration Database Does Not Exist - Copying Database to Default Location " << dbPath;
             QStringList Locations;
             Locations << ".";
@@ -170,10 +169,6 @@ int main(int argc, char *argv[])
                 qCWarning(ozwadmin) << "Cant find qt-openzwavedatabase.rcc";
                 QCoreApplication::exit(-1);
             }
-#else 
-            qCWarning(ozwadmin) << "Configuration Database Not Found";
-            QCoreApplication::exit(-1);
-#endif
         }
     }
     settings.setValue("openzwave/ConfigPath", dbPath);
@@ -191,7 +186,6 @@ int main(int argc, char *argv[])
         }
         /* if we dont have a userPath, Deploy our config files there */
         if (userPath.isEmpty()) {
-#ifndef Q_OS_WIN
             qCWarning(ozwadmin) << "User Configuration Path Does Not Exist - Copying Config Files to Location " << QFileInfo(parser.value(userDir).append("/")).absoluteFilePath();
             QStringList Locations;
             Locations << ".";
@@ -202,10 +196,6 @@ int main(int argc, char *argv[])
                 QCoreApplication::exit(-1);
             }
             userPath = QFileInfo(parser.value(userDir).append("/")).absoluteFilePath();
-#else 
-            qCWarning(ozwadmin) << "Configuration Database Not Found";
-            QCoreApplication::exit(-1);
-#endif
         }
     } else {
         /* search Default Locations for Config Files */
@@ -224,9 +214,8 @@ int main(int argc, char *argv[])
         }
         /* if we dont have a dbPath, Deploy our config files there */
         if (userPath.isEmpty()) {
-#ifndef Q_OS_WIN
-            userPath = QFileInfo("./").absoluteFilePath();
-            qCWarning(ozwadmin) << "Configuration Database Does Not Exist - Copying Database to Default Location " << dbPath;
+            userPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(0);
+            qCWarning(ozwadmin) << "Configuration Database Does Not Exist - Copying Database to Default Location " << userPath;
             QStringList Locations;
             Locations << ".";
             if (initConfigDatabase(Locations)) {
@@ -235,10 +224,6 @@ int main(int argc, char *argv[])
                 qCWarning(ozwadmin) << "Cant find qt-openzwavedatabase.rcc";
                 QCoreApplication::exit(-1);
             }
-#else 
-            qCWarning(ozwadmin) << "Configuration Database Not Found";
-            QCoreApplication::exit(-1);
-#endif
         }
     }
     settings.setValue("openzwave/UserPath", userPath);