comparison: src/main.cpp
src/main.cpp
- changeset 20
- a5457405cc9b
- parent 13
- 9bdddd2ccde6
- child 26
- 9aab482c9125
equal
deleted
inserted
replaced
| 19:c9b6dd9dd4cd | 20:a5457405cc9b |
|---|---|
| 15 * You should have received a copy of the GNU General Public License | 15 * You should have received a copy of the GNU General Public License |
| 16 * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 */ | 17 */ |
| 18 | 18 |
| 19 #include <QApplication> | 19 #include <QApplication> |
| 20 #include <QSettings> | 20 #include "config.h" |
| 21 #include "types.h" | 21 #include "types.h" |
| 22 #include "config.h" | |
| 23 #include "demo.h" | 22 #include "demo.h" |
| 24 | 23 |
| 25 // ============================================================================= | 24 // ============================================================================= |
| 26 // ----------------------------------------------------------------------------- | 25 // ----------------------------------------------------------------------------- |
| 27 int main (int argc, char* argv[]) { | 26 int main (int argc, char* argv[]) { |
| 28 QApplication app (argc, argv); | 27 QApplication app (argc, argv); |
| 29 app.setApplicationName (UNIXNAME); | 28 app.setApplicationName (UNIXNAME); |
| 30 app.setOrganizationName (UNIXNAME); | 29 app.setOrganizationName (UNIXNAME); |
| 31 app.setApplicationVersion (versionString()); | 30 app.setApplicationVersion (versionString()); |
| 31 | |
| 32 cfg::load(); | |
| 32 | 33 |
| 33 for (int i = 1; i < argc; ++i) { | 34 for (int i = 1; i < argc; ++i) { |
| 34 str arg = argv[i]; | 35 str arg = argv[i]; |
| 35 | 36 |
| 36 if (arg == "--config") { | 37 if (arg == "--config") { |
