Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Client|Updater: Relocated some autoupdater header files
  • Loading branch information
skyjake committed Aug 20, 2013
1 parent 8c5a335 commit 2807d0c
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 22 deletions.
8 changes: 4 additions & 4 deletions doomsday/client/client.pro
Expand Up @@ -387,7 +387,10 @@ DENG_HEADERS += \
include/ui/windowsystem.h \
include/ui/zonedebug.h \
include/updater.h \
include/updater/updatersettings.h \
include/updater/updatersettingsdialog.h \
include/uri.hh \
include/versioninfo.h \
include/world/blockmap.h \
include/world/bsp/bsptreenode.h \
include/world/bsp/convexsubspace.h \
Expand Down Expand Up @@ -430,10 +433,7 @@ DENG_HEADERS += \
src/updater/downloaddialog.h \
src/updater/processcheckdialog.h \
src/updater/updateavailabledialog.h \
src/updater/updaterdialog.h \
src/updater/updatersettings.h \
src/updater/updatersettingsdialog.h \
src/updater/versioninfo.h
src/updater/updaterdialog.h

INCLUDEPATH += \
$$DENG_INCLUDE_DIR \
Expand Down
Expand Up @@ -20,8 +20,8 @@
* 02110-1301 USA</small>
*/

#ifndef LIBDENG_UPDATERSETTINGS_H
#define LIBDENG_UPDATERSETTINGS_H
#ifndef DENG_CLIENT_UPDATERSETTINGS_H
#define DENG_CLIENT_UPDATERSETTINGS_H

#include <de/Time>
#include <de/String>
Expand Down Expand Up @@ -85,4 +85,4 @@ class UpdaterSettings
static de::NativePath defaultDownloadPath();
};

#endif // LIBDENG_UPDATERSETTINGS_H
#endif // DENG_CLIENT_UPDATERSETTINGS_H
Expand Up @@ -20,31 +20,38 @@
* 02110-1301 USA</small>
*/

#ifndef LIBDENG_UPDATERSETTINGSDIALOG_H
#define LIBDENG_UPDATERSETTINGSDIALOG_H
#ifndef DENG_CLIENT_UPDATERSETTINGSDIALOG_H
#define DENG_CLIENT_UPDATERSETTINGSDIALOG_H

#include <de/libdeng2.h>
#include "updaterdialog.h"
#include "ui/widgets/dialogwidget.h"

class UpdaterSettingsDialog : public UpdaterDialog
/**
* Dialog for configuring the settings of the automatic updater.
*/
class UpdaterSettingsDialog : public DialogWidget
{
Q_OBJECT

public:
explicit UpdaterSettingsDialog(QWidget *parent = 0);
UpdaterSettingsDialog(de::String const &name = "updatersettings");

void fetch();
//void fetch();

signals:

public slots:
/*
void accept();
void reject();
void autoCheckToggled(bool);
void pathActivated(int index);
*/

protected:
void finish(int result);

private:
DENG2_PRIVATE(d)
};

#endif // LIBDENG_UPDATERSETTINGSDIALOG_H
#endif // DENG_CLIENT_UPDATERSETTINGSDIALOG_H
File renamed without changes.
2 changes: 1 addition & 1 deletion doomsday/client/src/ui/widgets/aboutdialog.cpp
Expand Up @@ -23,7 +23,7 @@
#include "ui/style.h"
#include "ui/signalaction.h"
#include "clientapp.h"
#include "../../updater/versioninfo.h"
#include "versioninfo.h"

#include "dd_def.h"

Expand Down
1 change: 1 addition & 0 deletions doomsday/client/src/ui/widgets/taskbarwidget.cpp
Expand Up @@ -24,6 +24,7 @@
#include "ui/widgets/popupmenuwidget.h"
#include "ui/widgets/blurwidget.h"
#include "ui/widgets/aboutdialog.h"
#include "updater/updatersettingsdialog.h"
#include "ui/clientwindow.h"
#include "ui/commandaction.h"
#include "ui/signalaction.h"
Expand Down
2 changes: 1 addition & 1 deletion doomsday/client/src/updater/downloaddialog.cpp
Expand Up @@ -22,7 +22,7 @@
#include <QFile>
#include "de_platform.h"
#include "downloaddialog.h"
#include "updatersettings.h"
#include "updater/updatersettings.h"
#include "ui/clientwindow.h"
#include "dd_version.h"
#include <QNetworkAccessManager>
Expand Down
4 changes: 2 additions & 2 deletions doomsday/client/src/updater/updateavailabledialog.cpp
Expand Up @@ -21,8 +21,8 @@

#include "de_platform.h"
#include "updateavailabledialog.h"
#include "updatersettings.h"
#include "updatersettingsdialog.h"
#include "updater/updatersettings.h"
#include "updater/updatersettingsdialog.h"
#include "versioninfo.h"
#include <de/GuiApp>
#include <de/Log>
Expand Down
4 changes: 2 additions & 2 deletions doomsday/client/src/updater/updater.cpp
Expand Up @@ -55,8 +55,8 @@
#include "downloaddialog.h"
#include "processcheckdialog.h"
#include "updateavailabledialog.h"
#include "updatersettings.h"
#include "updatersettingsdialog.h"
#include "updater/updatersettings.h"
#include "updater/updatersettingsdialog.h"
#include "versioninfo.h"
#include <de/App>
#include <de/Time>
Expand Down
2 changes: 1 addition & 1 deletion doomsday/client/src/updater/updatersettings.cpp
Expand Up @@ -19,7 +19,7 @@
* 02110-1301 USA</small>
*/

#include "updatersettings.h"
#include "updater/updatersettings.h"
#include "versioninfo.h"
#include <QDateTime>
#include <QDesktopServices>
Expand Down

0 comments on commit 2807d0c

Please sign in to comment.