Commit ec339e65 authored by Andreas Traczyk's avatar Andreas Traczyk

updater: restore naming convention

Change-Id: Ia970f36f0186a95b82b6590c2912aaed6f694b57
parent fe6c3701
......@@ -15,13 +15,14 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
#include "downloadbar.h"
#include "downloadmanger.h"
#include <windows.h>
#include "updatedownloaddialog.h"
#include <QMessageBox>
#include <windows.h>
DownloadManager::DownloadManager(QObject* parent)
: QObject(parent)
{
......
......@@ -23,7 +23,7 @@
#include <QtCore>
#include <QtNetwork>
#include "downloadbar.h"
#include "updatedownloaddialog.h"
class QSslError;
......
......@@ -231,7 +231,7 @@
<ClCompile Include="animationhelpers.cpp" />
<ClCompile Include="currentaccountcombobox.cpp" />
<ClCompile Include="aboutdialog.cpp" />
<ClCompile Include="downloadbar.cpp" />
<ClCompile Include="updatedownloaddialog.cpp" />
<ClCompile Include="downloadmanger.cpp" />
<ClCompile Include="accountitemdelegate.cpp" />
<ClCompile Include="accountlistmodel.cpp" />
......@@ -396,7 +396,7 @@
<Define Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WINDOWS;UNICODE;_UNICODE;WIN32;WIN64;NIGHTLY_VERSION=20180706;ENABLE_AUTOUPDATE;QT_NO_DEBUG;NDEBUG</Define>
<Define Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">_WINDOWS;UNICODE;_UNICODE;WIN32;WIN64;NIGHTLY_VERSION=20180706;ENABLE_AUTOUPDATE;QT_NO_DEBUG;NDEBUG</Define>
</QtMoc>
<QtMoc Include="downloadbar.h">
<QtMoc Include="updatedownloaddialog.h">
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.;$(ProjectDir)..\ring-daemon\contrib\msvc\include;$(ProjectDir)..\daemon\contrib\msvc\include;$(ProjectDir)..\ring-lrc\src;$(ProjectDir)..\lrc\src;$(ProjectDir)winsparkle\include;$(ProjectDir)qrencode-win32\qrencode-win32;$(QTDIR)\include;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtXml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtCore;$(QTDIR)\mkspecs\win32-msvc;.\release</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">.\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.;$(ProjectDir)..\ring-daemon\contrib\msvc\include;$(ProjectDir)..\daemon\contrib\msvc\include;$(ProjectDir)..\ring-lrc\src;$(ProjectDir)..\lrc\src;$(ProjectDir)winsparkle\include;$(ProjectDir)qrencode-win32\qrencode-win32;$(QTDIR)\include;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtXml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtCore;$(QTDIR)\mkspecs\win32-msvc;.\release</IncludePath>
</QtMoc>
......@@ -604,7 +604,7 @@
<QtUic Include="callwidget.ui">
<SubType>Designer</SubType>
</QtUic>
<QtUic Include="downloadbar.ui" />
<QtUic Include="updatedownloaddialog.ui" />
<QtUic Include="deleteaccountdialog.ui">
<SubType>Designer</SubType>
</QtUic>
......
......@@ -150,9 +150,6 @@
<ClCompile Include="webchathelpers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="downloadbar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="downloadmanger.cpp">
<Filter>Source Files</Filter>
</ClCompile>
......@@ -210,6 +207,9 @@
<ClCompile Include="updateconfirmdialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="updatedownloaddialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<QtMoc Include="aboutdialog.h">
......@@ -305,9 +305,6 @@
<QtMoc Include="animationhelpers.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="downloadbar.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="downloadmanger.h">
<Filter>Header Files</Filter>
</QtMoc>
......@@ -359,6 +356,9 @@
<QtMoc Include="updateconfirmdialog.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="updatedownloaddialog.h">
<Filter>Header Files</Filter>
</QtMoc>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="debug\moc_predefs.h.cbt">
......@@ -623,9 +623,6 @@
<QtUic Include="advancedsipsettingwidget.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="downloadbar.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="nameregistrationdialog.ui">
<Filter>Form Files</Filter>
</QtUic>
......@@ -641,6 +638,9 @@
<QtUic Include="updateconfirmdialog.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="updatedownloaddialog.ui">
<Filter>Form Files</Filter>
</QtUic>
</ItemGroup>
<ItemGroup>
<None Include="images\FontAwesome.otf">
......@@ -793,4 +793,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
</Project>
\ No newline at end of file
......@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
#include "downloadbar.h"
#include "ui_downloadbar.h"
#include "updatedownloaddialog.h"
#include "ui_updatedownloaddialog.h"
updateDownloadDialog::updateDownloadDialog(QWidget* parent)
: QDialog(parent)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment