Author: cazfi Date: Fri Aug 12 14:13:03 2016 New Revision: 33573 URL: http://svn.gna.org/viewcvs/freeciv?rev=33573&view=rev Log: Merged ruledit_qt_setup(), ruledit_qt_run(), and ruledit_qt_close()
See patch #7591 Modified: trunk/tools/ruledit/ruledit.cpp trunk/tools/ruledit/ruledit_qt.cpp trunk/tools/ruledit/ruledit_qt.h Modified: trunk/tools/ruledit/ruledit.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit.cpp?rev=33573&r1=33572&r2=33573&view=diff ============================================================================== --- trunk/tools/ruledit/ruledit.cpp (original) +++ trunk/tools/ruledit/ruledit.cpp Fri Aug 12 14:13:03 2016 @@ -101,10 +101,7 @@ i_am_tool(); if (comments_load()) { - - ruledit_qt_setup(ui_options, argv); - ruledit_qt_run(); - ruledit_qt_close(); + ruledit_qt_run(ui_options, argv); comments_free(); } else { Modified: trunk/tools/ruledit/ruledit_qt.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit_qt.cpp?rev=33573&r1=33572&r2=33573&view=diff ============================================================================== --- trunk/tools/ruledit/ruledit_qt.cpp (original) +++ trunk/tools/ruledit/ruledit_qt.cpp Fri Aug 12 14:13:03 2016 @@ -54,12 +54,13 @@ static QApplication *qapp; /************************************************************************** - Setup ruledit-qt gui. -**************************************************************************/ -bool ruledit_qt_setup(int argc, char **argv) + Run ruledit-qt gui. +**************************************************************************/ +int ruledit_qt_run(int argc, char **argv) { ruledit_main *main_window; QWidget *central; + int ret; qapp = new QApplication(argc, argv); central = new QWidget; @@ -70,24 +71,12 @@ main_window->setCentralWidget(central); main_window->setVisible(true); - return true; -} - -/************************************************************************** - Execute ruledit-qt gui. -**************************************************************************/ -int ruledit_qt_run() -{ - return qapp->exec(); -} - -/************************************************************************** - Close ruledit-qt gui. -**************************************************************************/ -void ruledit_qt_close() -{ + ret = qapp->exec(); + delete gui; delete qapp; + + return ret; } /************************************************************************** Modified: trunk/tools/ruledit/ruledit_qt.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit_qt.h?rev=33573&r1=33572&r2=33573&view=diff ============================================================================== --- trunk/tools/ruledit/ruledit_qt.h (original) +++ trunk/tools/ruledit/ruledit_qt.h Fri Aug 12 14:13:03 2016 @@ -1,4 +1,4 @@ -/*********************************************************************** +/*********************************************************************** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -82,9 +82,7 @@ void launch_now(); }; -bool ruledit_qt_setup(int argc, char **argv); -int ruledit_qt_run(); -void ruledit_qt_close(); +int ruledit_qt_run(int argc, char **argv); void ruledit_qt_display_requirers(const char *msg, void *data); #endif // FC__RULEDIT_QT_H _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits