reapack

commit 74bfe0b73792a286ea93de7623ae56bae2e7e3e0
parent 0c04ba4c8bd1cab1a34d49476da06cf3bb4c5e2d
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Fri, 15 Sep 2017 04:14:35 -0400

(use static_cast when appropriate)

Diffstat:
M
src/about.cpp
 | 
6
+++---
M
src/about.hpp
 | 
8
++++++--
M
src/browser.cpp
 | 
4
++--
M
src/dialog.hpp
 | 
2
+-
M
src/listview.cpp
 | 
8
++++----

5 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/about.cpp b/src/about.cpp
@@ -409,7 +409,7 @@ const Package *AboutIndexDelegate::currentPackage() const
   if(index < 0)
     return nullptr;
   else
-    return (const Package *)m_dialog->list()->row(index)->userData;
+    return static_cast<const Package *>(m_dialog->list()->row(index)->userData);
 }
 
 void AboutIndexDelegate::findInBrowser()
@@ -596,7 +596,7 @@ bool AboutPackageDelegate::fillContextMenu(Menu &menu, const int index) const
   if(index < 0)
     return false;
 
-  auto src = (const Source *)m_dialog->list()->row(index)->userData;
+  auto src = static_cast<const Source *>(m_dialog->list()->row(index)->userData);
 
   menu.addAction("Copy source URL", ACTION_COPY_URL);
   menu.setEnabled(m_current.size() > 0 && FS::exists(src->targetPath()),
@@ -627,7 +627,7 @@ const Source *AboutPackageDelegate::currentSource() const
   if(index < 0)
     return nullptr;
   else
-    return (const Source *)m_dialog->list()->row(index)->userData;
+    return static_cast<const Source *>(m_dialog->list()->row(index)->userData);
 }
 
 void AboutPackageDelegate::copySourceUrl()
diff --git a/src/about.hpp b/src/about.hpp
@@ -105,7 +105,9 @@ protected:
   void onCommand(int) override;
 
   const void *data() const override
-  { return reinterpret_cast<const void *>(m_index.get()); }
+  {
+    return static_cast<const void *>(m_index.get());
+  }
 
 private:
   void initInstalledFiles();
@@ -132,7 +134,9 @@ protected:
   void onCommand(int) override;
 
   const void *data() const override
-  { return reinterpret_cast<const void *>(m_package); }
+  {
+    return static_cast<const void *>(m_package);
+  }
 
 private:
   const Source *currentSource() const;
diff --git a/src/browser.cpp b/src/browser.cpp
@@ -514,7 +514,7 @@ void Browser::fillList()
   vector<int> selectIndexes = m_list->selection();
   vector<const Entry *> oldSelection(selectIndexes.size());
   for(size_t i = 0; i < selectIndexes.size(); i++)
-    oldSelection[i] = (Entry *)m_list->row(selectIndexes[i])->userData;
+    oldSelection[i] = static_cast<Entry *>(m_list->row(selectIndexes[i])->userData);
   selectIndexes.clear(); // will put new indexes below
 
   m_list->clear();
@@ -584,7 +584,7 @@ auto Browser::getEntry(const int index) -> Entry *
   if(index < 0)
     return nullptr;
   else
-    return (Entry *)m_list->row(index)->userData;
+    return static_cast<Entry *>(m_list->row(index)->userData);
 }
 
 void Browser::aboutPackage(const int index, const bool focus)
diff --git a/src/dialog.hpp b/src/dialog.hpp
@@ -57,7 +57,7 @@ public:
     Dialog *dlg = new T(args...);
     dlg->init(instance, parent, Dialog::Modeless);
 
-    return dynamic_cast<T *>(dlg);
+    return static_cast<T *>(dlg);
   }
 
   template<class T, class... Args>
diff --git a/src/listview.cpp b/src/listview.cpp
@@ -553,11 +553,11 @@ int ListView::Column::compare(const ListView::Cell &cl, const ListView::Cell &cr
     return l.compare(r);
   }
   case VersionType:
-    return reinterpret_cast<const VersionName *>(cl.userData)->compare(
-      *reinterpret_cast<const VersionName *>(cr.userData));
+    return static_cast<const VersionName *>(cl.userData)->compare(
+      *static_cast<const VersionName *>(cr.userData));
   case TimeType:
-    return reinterpret_cast<const Time *>(cl.userData)->compare(
-      *reinterpret_cast<const Time *>(cr.userData));
+    return static_cast<const Time *>(cl.userData)->compare(
+      *static_cast<const Time *>(cr.userData));
   }
 
   return 0; // to make MSVC happy