Moved to TDrawingOptsBase.cxx.

graf2d/gpad/v7/src/TCanvas.cxx

@@ -122,111 +122,4 @@ void ROOT::Experimental::TCanvas::SaveAs(const std::string &filename, bool async
       fPainter->DoWhenReady("JPEG", filename, async, callback);
 }
 
-void ROOT::Experimental::TCanvas::RegisterColor(size_t &idx, const TColor &col)
-{
-   if (idx == (size_t)-1) {
-      idx = fColorTable.size();
-      fColorTable.push_back(col);
-   } else {
-      fColorTable[idx] = col;
-   }
-}
-
 // TODO: removal from GetHeldCanvases().
-
-template <class PRIMITIVE>
-void ROOT::Experimental::Internal::TOptsAttrAndUseCount<PRIMITIVE>::Clear()
-{
-   if (fUseCount) {
-      R__ERROR_HERE("Gpad") << "Refusing to clear a referenced primitive (use count " << fUseCount << ")!";
-      return;
-   }
-   // destroy fVal:
-   fVal.~PRIMITIVE();
-}
-
-template <class PRIMITIVE>
-void ROOT::Experimental::Internal::TOptsAttrAndUseCount<PRIMITIVE>::Create(const PRIMITIVE &val)
-{
-   if (fUseCount) {
-      R__ERROR_HERE("Gpad") << "Refusing to create a primitive over an existing one (use count " << fUseCount << ")!";
-      return;
-   }
-   // copy-construct fVal:
-   new (fVal) PRIMITIVE(val);
-   fUseCount = 1;
-}
-
-template <class PRIMITIVE>
-void ROOT::Experimental::Internal::TOptsAttrAndUseCount<PRIMITIVE>::IncrUse(const PRIMITIVE &val)
-{
-   if (fUseCount == 0) {
-      R__ERROR_HERE("Gpad") << "Refusing to increase use count on a non-existing primitive!";
-      return;
-   }
-   ++fUseCount;
-}
-
-template <class PRIMITIVE>
-void ROOT::Experimental::Internal::TOptsAttrAndUseCount<PRIMITIVE>::DecrUse(const PRIMITIVE &val)
-{
-   if (fUseCount == 0) {
-      R__ERROR_HERE("Gpad") << "Refusing to decrease use count on a non-existing primitive!";
-      return;
-   }
-   --fUseCount;
-   if (fUseCount == 0)
-      Clear();
-}
-
-// Available specialization:
-template class ROOT::Experimental::Internal::TOptsAttrAndUseCount<TColor>;
-template class ROOT::Experimental::Internal::TOptsAttrAndUseCount<long long>;
-template class ROOT::Experimental::Internal::TOptsAttrAndUseCount<double>;
-
-template <class PRIMITIVE>
-size_t TOptsAttrTable::Register(const PRIMITIVE &val)
-{
-   auto isFree = [](const value_type &el) -> bool { return el.IsFree() };
-   auto iSlot = std::find_if(fTable.begin(), fTable.last(), isFree);
-   if (iSlot != fTable.end()) {
-      iSlot.Create(val);
-      return iSlot - fTable.begin();
-   }
-   fTable.emplace_back(val);
-   return fTable.size() - 1;
-}
-
-// Available specialization:
-template class ROOT::Experimental::Internal::TOptsAttrTable<TColor>;
-template class ROOT::Experimental::Internal::TOptsAttrTable<long long>;
-template class ROOT::Experimental::Internal::TOptsAttrTable<double>;
-
-template ROOT::Experimental::Internal::TOptsAttrTable<TColor> &ROOT::Experimental::TCanvas::GetAttrTable<TColor>()
-{
-   return fColorTable;
-}
-template ROOT::Experimental::Internal::TOptsAttrTable<long long> &ROOT::Experimental::TCanvas::GetAttrTable<long long>()
-{
-   return fIntAttrTable;
-}
-template ROOT::Experimental::Internal::TOptsAttrTable<double> &ROOT::Experimental::TCanvas::GetAttrTable<double>()
-{
-   return fFPAttrTable;
-}
-
-template const ROOT::Experimental::Internal::TOptsAttrTable<TColor> &
-ROOT::Experimental::TCanvas::GetAttrTable<TColor>() const
-{
-   return fColorTable;
-}
-template const ROOT::Experimental::Internal::TOptsAttrTable<long long> &
-ROOT::Experimental::TCanvas::GetAttrTable<long long>() const
-{
-   return fIntAttrTable;
-}
-template const ROOT::Experimental::Internal::TOptsAttrTable<double> &
-ROOT::Experimental::TCanvas::GetAttrTable<double>() const
-{
-   return fFPAttrTable;
-}