MpcImportWindow.hpp   MpcImportWindow.hpp 
skipping to change at line 48 skipping to change at line 48
{ {
Q_OBJECT Q_OBJECT
public: public:
enum ImportType { enum ImportType {
MpcComets, MpcComets,
MpcMinorPlanets MpcMinorPlanets
}; };
MpcImportWindow(); MpcImportWindow();
virtual ~MpcImportWindow(); virtual ~MpcImportWindow();
public slots:
void languageChanged(); void languageChanged();
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
skipping to change at line 70 skipping to change at line 72
//Download //Download
void pasteClipboardURL(); void pasteClipboardURL();
void bookmarkSelected(QString); void bookmarkSelected(QString);
//Buttons for the list tab //Buttons for the list tab
void acquireObjectData(); void acquireObjectData();
void abortDownload(); void abortDownload();
//Online search //Online search
void sendQuery(); void sendQuery();
void sendQueryToUrl(QUrl url);
void abortQuery(); void abortQuery();
void updateCountdown(); void updateCountdown();
void resetNotFound(); void resetNotFound();
//Network //Network
void updateDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) ; void updateDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) ;
void updateQueryProgress(qint64 bytesReceived, qint64 bytesTotal); void updateQueryProgress(qint64 bytesReceived, qint64 bytesTotal);
void downloadComplete(QNetworkReply * reply); void downloadComplete(QNetworkReply * reply);
void queryComplete(QNetworkReply * reply); void receiveQueryReply(QNetworkReply * reply);
void readQueryReply(QNetworkReply * reply);
//! Marks (checks) all items in the results lists //! Marks (checks) all items in the results lists
void markAll(); void markAll();
//! Unmarks (unchecks) all items in the results lists //! Unmarks (unchecks) all items in the results lists
void unmarkAll(); void unmarkAll();
void addObjects(); void addObjects();
void discardObjects(); void discardObjects();
//! resets the dialog to the state it should be in immediately after createDialogContent();. //! resets the dialog to the state it should be in immediately after createDialogContent();.
void resetDialog(); void resetDialog();
skipping to change at line 125 skipping to change at line 129
void deleteQueryProgressBar(); void deleteQueryProgressBar();
typedef QHash<QString,QString> Bookmarks; typedef QHash<QString,QString> Bookmarks;
QHash<ImportType, Bookmarks> bookmarks; QHash<ImportType, Bookmarks> bookmarks;
void loadBookmarks(); void loadBookmarks();
void loadBookmarksGroup(QVariantMap source, Bookmarks & bookmarkGrou p); void loadBookmarksGroup(QVariantMap source, Bookmarks & bookmarkGrou p);
void saveBookmarks(); void saveBookmarks();
void saveBookmarksGroup(Bookmarks & bookmarkGroup, QVariantMap & out put); void saveBookmarksGroup(Bookmarks & bookmarkGroup, QVariantMap & out put);
//Online search //Online search
QString query;
int countdown; int countdown;
QTimer * countdownTimer; QTimer * countdownTimer;
void startCountdown(); void startCountdown();
void resetCountdown(); void resetCountdown();
protected: protected:
virtual void createDialogContent(); virtual void createDialogContent();
Ui_mpcImportWindow * ui; Ui_mpcImportWindow * ui;
}; };
 End of changes. 4 change blocks. 
1 lines changed or deleted 6 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/