MpcImportWindow.hpp   MpcImportWindow.hpp 
skipping to change at line 18 skipping to change at line 18
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _MPC_IMPORT_WINDOW_ #ifndef _MPC_IMPORT_WINDOW_
#define _MPC_IMPORT_WINDOW_ #define _MPC_IMPORT_WINDOW_
#include <QObject> #include <QObject>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <QProgressBar> #include <QProgressBar>
#include <QStandardItemModel> #include <QStandardItemModel>
skipping to change at line 51 skipping to change at line 51
public: public:
enum ImportType { enum ImportType {
MpcComets, MpcComets,
MpcMinorPlanets MpcMinorPlanets
}; };
MpcImportWindow(); MpcImportWindow();
virtual ~MpcImportWindow(); virtual ~MpcImportWindow();
public slots: public slots:
void languageChanged(); void retranslate();
signals: signals:
void objectsImported(); void objectsImported();
private slots: private slots:
//Radio buttons for type //Radio buttons for type
void switchImportType(bool checked); void switchImportType(bool checked);
//File //File
void selectFile(); void selectFile();
skipping to change at line 103 skipping to change at line 103
void resetDialog(); void resetDialog();
private: private:
SolarSystemEditor * ssoManager; SolarSystemEditor * ssoManager;
QList<SsoElements> candidatesForAddition; QList<SsoElements> candidatesForAddition;
QList<SsoElements> candidatesForUpdate; QList<SsoElements> candidatesForUpdate;
QStandardItemModel * candidateObjectsModel; QStandardItemModel * candidateObjectsModel;
ImportType importType; ImportType importType;
void updateTexts();
//! wrapper for the single object function to allow multiple formats . //! wrapper for the single object function to allow multiple formats .
SsoElements readElementsFromString(QString elements); SsoElements readElementsFromString(QString elements);
//! wrapper for the file function to allow multiple formats //! wrapper for the file function to allow multiple formats
QList<SsoElements> readElementsFromFile(ImportType type, QString fil ePath); QList<SsoElements> readElementsFromFile(ImportType type, QString fil ePath);
void populateBookmarksList(); void populateBookmarksList();
//void populateCandidateObjects(); //void populateCandidateObjects();
void populateCandidateObjects(QList<SsoElements>); void populateCandidateObjects(QList<SsoElements>);
void enableInterface(bool enable); void enableInterface(bool enable);
 End of changes. 3 change blocks. 
2 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/