Cleanup: Successful build of the entire project

skyjake · Sep 1, 2019 · 2dd22e2 · 2dd22e2
1 parent 80d2edc
commit 2dd22e2
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 20 deletions.
diff --git a/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp b/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp
@@ -442,8 +442,12 @@ DE_GUI_PIMPL(ServerInfoDialog)
         updateContent();
         self().buttonWidget(ID_PING)->enable();
     }
+
+    DE_PIMPL_AUDIENCE(JoinGame)
 };
 
+DE_AUDIENCE_METHOD(ServerInfoDialog, JoinGame)
+
 ServerInfoDialog::ServerInfoDialog(shell::ServerInfo const &serverInfo)
     : d(new Impl(this, serverInfo))
 {

diff --git a/doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp b/doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp
@@ -140,8 +140,12 @@ DE_GUI_PIMPL(PackagesColumnWidget)
         dlg->setDeleteAfterDismissed(true);
         dlg->exec(root());
     }
+
+    DE_PIMPL_AUDIENCE(AvailableCount)
 };
 
+DE_AUDIENCE_METHOD(PackagesColumnWidget, AvailableCount)
+
 PackagesColumnWidget::PackagesColumnWidget()
     : ColumnWidget("packages-column")
     , d(new Impl(this))

diff --git a/doomsday/apps/client/src/ui/widgets/consolewidget.cpp b/doomsday/apps/client/src/ui/widgets/consolewidget.cpp
@@ -290,8 +290,12 @@ DE_GUI_PIMPL(ConsoleWidget)
             log->scrollToBottom();
         }
     }
+
+    DE_PIMPL_AUDIENCES(CommandMode, GotFocus)
 };
 
+DE_AUDIENCE_METHODS(ConsoleWidget, CommandMode, GotFocus)
+
 static PopupWidget *consoleShortcutPopup()
 {
     auto *pop = new PopupWidget;

diff --git a/doomsday/apps/client/src/ui/widgets/packageswidget.cpp b/doomsday/apps/client/src/ui/widgets/packageswidget.cpp
@@ -860,8 +860,12 @@ DE_GUI_PIMPL(PackagesWidget)
         DENG2_ASSERT_IN_MAIN_THREAD();
         w.updateContents();
     }
+
+    DE_PIMPL_AUDIENCE(ItemCount)
 };
 
+DE_AUDIENCE_METHOD(PackagesWidget, ItemCount)
+
 PackagesWidget::PackagesWidget(PopulateBehavior initBehavior, String const &name)
     : GuiWidget(name)
     , d(new Impl(this))

diff --git a/doomsday/apps/client/src/ui/widgets/profilepickerwidget.cpp b/doomsday/apps/client/src/ui/widgets/profilepickerwidget.cpp
@@ -75,8 +75,12 @@ DE_GUI_PIMPL(ProfilePickerWidget)
     {
         return self().selectedItem().data().asText();
     }
+
+    DE_PIMPL_AUDIENCES(ProfileChange, EditorRequest)
 };
 
+DE_AUDIENCE_METHODS(ProfilePickerWidget, ProfileChange, EditorRequest)
+
 ProfilePickerWidget::ProfilePickerWidget(ConfigProfiles &settings, String const &description, String const &name)
     : ChoiceWidget(name), d(new Impl(this, settings))
 {

diff --git a/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp b/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp
@@ -343,8 +343,12 @@ DE_GUI_PIMPL(TaskBarWidget)
             mainMenu->items().at(POS_HOME).setLabel("Show Home");
         }
     }
+
+    DE_PIMPL_AUDIENCES(Open, Close)
 };
 
+DE_AUDIENCE_METHODS(TaskBarWidget, Open, Close)
+
 #if defined (DE_HAVE_UPDATER)
 static PopupWidget *makeUpdaterSettings()
 {

diff --git a/doomsday/apps/client/src/updater/updatedownloaddialog.cpp b/doomsday/apps/client/src/updater/updatedownloaddialog.cpp
@@ -271,25 +271,6 @@ void UpdateDownloadDialog::finished(QNetworkReply *reply)
     LOG_DEBUG("Request finished");
 }
 
-void UpdateDownloadDialog::cancel()
-{
-    LOG_NOTE("Download cancelled due to user request");
-
-    d->state = Impl::Error;
-    progressIndicator().setRotationSpeed(0);
-
-    if (d->reply)
-    {
-        d->reply->abort();
-        buttons().clear()
-                << new DialogButtonItem(DialogWidget::Reject, tr("Close"));
-    }
-    else
-    {
-        reject();
-    }
-}
-
 void UpdateDownloadDialog::progress(qint64 received, qint64 total)
 {
     LOG_AS("Download");
@@ -331,6 +312,24 @@ void UpdateDownloadDialog::replyMetaDataChanged()
 }
 #endif
 
+void UpdateDownloadDialog::cancel()
+{
+    LOG_NOTE("Download cancelled due to user request");
+
+    d->state = Impl::Error;
+    progressIndicator().setRotationSpeed(0);
+
+//    if (d->reply)
+//    {
+//        d->reply->abort();
+//        buttons().clear() << new DialogButtonItem(DialogWidget::Reject, "Close");
+//    }
+//    else
+//    {
+//        reject();
+//    }
+}
+
 bool UpdateDownloadDialog::isDownloadInProgress()
 {
     return downloadInProgress != 0;

diff --git a/doomsday/libs/core/include/de/filesys/archiveentryfile.h b/doomsday/libs/core/include/de/filesys/archiveentryfile.h
@@ -32,7 +32,7 @@ class ArchiveFolder;
  *
  * @ingroup fs
  */
-class ArchiveEntryFile : public ByteArrayFile
+class DE_PUBLIC ArchiveEntryFile : public ByteArrayFile
 {
 public:
     /**