mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
main.cpp: remove usage of subsurface_command_line_*
subsurface_command_line_* are now redundant as Qt should handle the command line argument parsing on Windows for which these functions where mainly used and where NOP for other OS. main.cpp also receives a couple of small changes to use: QCoreApplication::arguments() to obtain the list of expanded arguments and parse those instead. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
d0e9d1f383
commit
218c0956e2
4 changed files with 7 additions and 91 deletions
15
main.cpp
15
main.cpp
|
@ -32,23 +32,23 @@ int main(int argc, char **argv)
|
|||
setup_system_prefs();
|
||||
prefs = default_prefs;
|
||||
|
||||
subsurface_command_line_init(&argc, &argv);
|
||||
init_ui(&argc, &argv);
|
||||
parse_xml_init();
|
||||
|
||||
QStringList files;
|
||||
QStringList importedFiles;
|
||||
for (i = 1; i < argc; i++) {
|
||||
const char *a = argv[i];
|
||||
if (a[0] == '-') {
|
||||
parse_argument(a);
|
||||
QStringList arguments = QCoreApplication::arguments();
|
||||
for (i = 1; i < arguments.length(); i++) {
|
||||
QString a = arguments.at(i);
|
||||
if (a.at(0) == '-') {
|
||||
parse_argument(a.toLocal8Bit().data());
|
||||
continue;
|
||||
}
|
||||
if (imported) {
|
||||
importedFiles.push_back( QString(a) );
|
||||
importedFiles.push_back(a);
|
||||
} else {
|
||||
no_filenames = false;
|
||||
files.push_back( QString(a) );
|
||||
files.push_back(a);
|
||||
}
|
||||
}
|
||||
if (no_filenames) {
|
||||
|
@ -57,7 +57,6 @@ int main(int argc, char **argv)
|
|||
files.push_back( QString(prefs.default_filename) );
|
||||
}
|
||||
parse_xml_exit();
|
||||
subsurface_command_line_exit(&argc, &argv);
|
||||
mainWindow()->loadFiles(files);
|
||||
mainWindow()->importFiles(importedFiles);
|
||||
run_ui();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue