From 7c44680a3623191910d7fb6617ff897583f2ef60 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Feb 2003 18:17:25 +0000 Subject: [PATCH] Renamed the private virtual slots back to their original (R5) names. We would break binary compatibility otherwise, or at least had to do some additional work to maintain nevertheless. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2683 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/storage/Directory.h | 12 ++++++------ headers/os/storage/File.h | 12 ++++++------ headers/os/storage/Node.h | 12 ++++++------ headers/os/storage/ResourceStrings.h | 12 ++++++------ headers/os/storage/SymLink.h | 12 ++++++------ headers/os/storage/Volume.h | 16 ++++++++-------- headers/os/storage/VolumeRoster.h | 4 ++-- src/kits/storage/Directory.cpp | 12 ++++++------ src/kits/storage/File.cpp | 12 ++++++------ src/kits/storage/Node.cpp | 12 ++++++------ src/kits/storage/ResourceStrings.cpp | 12 ++++++------ src/kits/storage/SymLink.cpp | 12 ++++++------ src/kits/storage/Volume.cpp | 16 ++++++++-------- src/kits/storage/VolumeRoster.cpp | 4 ++-- 14 files changed, 80 insertions(+), 80 deletions(-) diff --git a/headers/os/storage/Directory.h b/headers/os/storage/Directory.h index f821b7192d..628ddc4e1c 100644 --- a/headers/os/storage/Directory.h +++ b/headers/os/storage/Directory.h @@ -78,12 +78,12 @@ public: BDirectory &operator=(const BDirectory &dir); private: - virtual void _ReservedDirectory1(); - virtual void _ReservedDirectory2(); - virtual void _ReservedDirectory3(); - virtual void _ReservedDirectory4(); - virtual void _ReservedDirectory5(); - virtual void _ReservedDirectory6(); + virtual void _ErectorDirectory1(); + virtual void _ErectorDirectory2(); + virtual void _ErectorDirectory3(); + virtual void _ErectorDirectory4(); + virtual void _ErectorDirectory5(); + virtual void _ErectorDirectory6(); private: virtual void close_fd(); diff --git a/headers/os/storage/File.h b/headers/os/storage/File.h index dd75c192d8..f0d470182d 100644 --- a/headers/os/storage/File.h +++ b/headers/os/storage/File.h @@ -61,12 +61,12 @@ public: BFile &operator=(const BFile &file); private: - virtual void _ReservedFile1(); - virtual void _ReservedFile2(); - virtual void _ReservedFile3(); - virtual void _ReservedFile4(); - virtual void _ReservedFile5(); - virtual void _ReservedFile6(); + virtual void _PhiloFile1(); + virtual void _PhiloFile2(); + virtual void _PhiloFile3(); + virtual void _PhiloFile4(); + virtual void _PhiloFile5(); + virtual void _PhiloFile6(); uint32 _reservedData[8]; diff --git a/headers/os/storage/Node.h b/headers/os/storage/Node.h index 35ab65c255..b34b54c915 100644 --- a/headers/os/storage/Node.h +++ b/headers/os/storage/Node.h @@ -105,12 +105,12 @@ private: friend class BDirectory; friend class BSymLink; - virtual void _ReservedNode1(); - virtual void _ReservedNode2(); - virtual void _ReservedNode3(); - virtual void _ReservedNode4(); - virtual void _ReservedNode5(); - virtual void _ReservedNode6(); + virtual void _RudeNode1(); + virtual void _RudeNode2(); + virtual void _RudeNode3(); + virtual void _RudeNode4(); + virtual void _RudeNode5(); + virtual void _RudeNode6(); uint32 rudeData[4]; diff --git a/headers/os/storage/ResourceStrings.h b/headers/os/storage/ResourceStrings.h index db61d01862..e90142b6b6 100644 --- a/headers/os/storage/ResourceStrings.h +++ b/headers/os/storage/ResourceStrings.h @@ -79,12 +79,12 @@ private: virtual _string_id_hash *_FindString(int32 id); // FBC - virtual void _ReservedResourceStrings0(); - virtual void _ReservedResourceStrings1(); - virtual void _ReservedResourceStrings2(); - virtual void _ReservedResourceStrings3(); - virtual void _ReservedResourceStrings4(); - virtual void _ReservedResourceStrings5(); + virtual status_t _Reserved_ResourceStrings_0(void *); + virtual status_t _Reserved_ResourceStrings_1(void *); + virtual status_t _Reserved_ResourceStrings_2(void *); + virtual status_t _Reserved_ResourceStrings_3(void *); + virtual status_t _Reserved_ResourceStrings_4(void *); + virtual status_t _Reserved_ResourceStrings_5(void *); }; #endif // _RESOURCE_STRINGS_H diff --git a/headers/os/storage/SymLink.h b/headers/os/storage/SymLink.h index f518e34593..09cb14b648 100644 --- a/headers/os/storage/SymLink.h +++ b/headers/os/storage/SymLink.h @@ -61,12 +61,12 @@ public: BSymLink &operator=(const BSymLink &link); private: - virtual void _ReservedSymLink1(); - virtual void _ReservedSymLink2(); - virtual void _ReservedSymLink3(); - virtual void _ReservedSymLink4(); - virtual void _ReservedSymLink5(); - virtual void _ReservedSymLink6(); + virtual void _MissingSymLink1(); + virtual void _MissingSymLink2(); + virtual void _MissingSymLink3(); + virtual void _MissingSymLink4(); + virtual void _MissingSymLink5(); + virtual void _MissingSymLink6(); // WORKAROUND // fSecretEntry: Part of a work around until someone has an idea how to diff --git a/headers/os/storage/Volume.h b/headers/os/storage/Volume.h index 0a04af87fe..2d91e1930a 100644 --- a/headers/os/storage/Volume.h +++ b/headers/os/storage/Volume.h @@ -65,14 +65,14 @@ public: private: // friend class BVolumeRoster; - virtual void _ReservedVolume1(); - virtual void _ReservedVolume2(); - virtual void _ReservedVolume3(); - virtual void _ReservedVolume4(); - virtual void _ReservedVolume5(); - virtual void _ReservedVolume6(); - virtual void _ReservedVolume7(); - virtual void _ReservedVolume8(); + virtual void _TurnUpTheVolume1(); + virtual void _TurnUpTheVolume2(); + virtual void _TurnUpTheVolume3(); + virtual void _TurnUpTheVolume4(); + virtual void _TurnUpTheVolume5(); + virtual void _TurnUpTheVolume6(); + virtual void _TurnUpTheVolume7(); + virtual void _TurnUpTheVolume8(); dev_t fDevice; status_t fCStatus; diff --git a/headers/os/storage/VolumeRoster.h b/headers/os/storage/VolumeRoster.h index d22fc7fd44..ba45e199e0 100644 --- a/headers/os/storage/VolumeRoster.h +++ b/headers/os/storage/VolumeRoster.h @@ -39,8 +39,8 @@ public: BMessenger Messenger() const; private: - virtual void _ReservedVolumeRoster1(); - virtual void _ReservedVolumeRoster2(); + virtual void _SeveredVRoster1(); + virtual void _SeveredVRoster2(); int32 fCookie; BMessenger *fTarget; diff --git a/src/kits/storage/Directory.cpp b/src/kits/storage/Directory.cpp index 8735abe5a6..6c8237236f 100644 --- a/src/kits/storage/Directory.cpp +++ b/src/kits/storage/Directory.cpp @@ -875,12 +875,12 @@ BDirectory::operator=(const BDirectory &dir) // FBC -void BDirectory::_ReservedDirectory1() {} -void BDirectory::_ReservedDirectory2() {} -void BDirectory::_ReservedDirectory3() {} -void BDirectory::_ReservedDirectory4() {} -void BDirectory::_ReservedDirectory5() {} -void BDirectory::_ReservedDirectory6() {} +void BDirectory::_ErectorDirectory1() {} +void BDirectory::_ErectorDirectory2() {} +void BDirectory::_ErectorDirectory3() {} +void BDirectory::_ErectorDirectory4() {} +void BDirectory::_ErectorDirectory5() {} +void BDirectory::_ErectorDirectory6() {} // close_fd //! Closes the BDirectory's file descriptor. diff --git a/src/kits/storage/File.cpp b/src/kits/storage/File.cpp index d69daecadf..f8d8f6c876 100644 --- a/src/kits/storage/File.cpp +++ b/src/kits/storage/File.cpp @@ -499,12 +499,12 @@ BFile::operator=(const BFile &file) // FBC -void BFile::_ReservedFile1() {} -void BFile::_ReservedFile2() {} -void BFile::_ReservedFile3() {} -void BFile::_ReservedFile4() {} -void BFile::_ReservedFile5() {} -void BFile::_ReservedFile6() {} +void BFile::_PhiloFile1() {} +void BFile::_PhiloFile2() {} +void BFile::_PhiloFile3() {} +void BFile::_PhiloFile4() {} +void BFile::_PhiloFile5() {} +void BFile::_PhiloFile6() {} // get_fd diff --git a/src/kits/storage/Node.cpp b/src/kits/storage/Node.cpp index 30f2b0c1fe..1306aa9dee 100644 --- a/src/kits/storage/Node.cpp +++ b/src/kits/storage/Node.cpp @@ -642,12 +642,12 @@ BNode::Dup() /*! (currently unused) */ -void BNode::_ReservedNode1() { } -void BNode::_ReservedNode2() { } -void BNode::_ReservedNode3() { } -void BNode::_ReservedNode4() { } -void BNode::_ReservedNode5() { } -void BNode::_ReservedNode6() { } +void BNode::_RudeNode1() { } +void BNode::_RudeNode2() { } +void BNode::_RudeNode3() { } +void BNode::_RudeNode4() { } +void BNode::_RudeNode5() { } +void BNode::_RudeNode6() { } /*! \brief Sets the node's file descriptor. Used by each implementation (i.e. BNode, BFile, BDirectory, etc.) to set diff --git a/src/kits/storage/ResourceStrings.cpp b/src/kits/storage/ResourceStrings.cpp index 1bf1535b3d..421b2bc442 100644 --- a/src/kits/storage/ResourceStrings.cpp +++ b/src/kits/storage/ResourceStrings.cpp @@ -345,12 +345,12 @@ BResourceStrings::_FindString(int32 id) // FBC -void BResourceStrings::_ReservedResourceStrings0() {} -void BResourceStrings::_ReservedResourceStrings1() {} -void BResourceStrings::_ReservedResourceStrings2() {} -void BResourceStrings::_ReservedResourceStrings3() {} -void BResourceStrings::_ReservedResourceStrings4() {} -void BResourceStrings::_ReservedResourceStrings5() {} +status_t BResourceStrings::_Reserved_ResourceStrings_0(void *) { return 0; } +status_t BResourceStrings::_Reserved_ResourceStrings_1(void *) { return 0; } +status_t BResourceStrings::_Reserved_ResourceStrings_2(void *) { return 0; } +status_t BResourceStrings::_Reserved_ResourceStrings_3(void *) { return 0; } +status_t BResourceStrings::_Reserved_ResourceStrings_4(void *) { return 0; } +status_t BResourceStrings::_Reserved_ResourceStrings_5(void *) { return 0; } // _string_id_hash diff --git a/src/kits/storage/SymLink.cpp b/src/kits/storage/SymLink.cpp index 65109df7c3..c0c5ee0245 100644 --- a/src/kits/storage/SymLink.cpp +++ b/src/kits/storage/SymLink.cpp @@ -304,12 +304,12 @@ BSymLink::operator=(const BSymLink &link) } -void BSymLink::_ReservedSymLink1() {} -void BSymLink::_ReservedSymLink2() {} -void BSymLink::_ReservedSymLink3() {} -void BSymLink::_ReservedSymLink4() {} -void BSymLink::_ReservedSymLink5() {} -void BSymLink::_ReservedSymLink6() {} +void BSymLink::_MissingSymLink1() {} +void BSymLink::_MissingSymLink2() {} +void BSymLink::_MissingSymLink3() {} +void BSymLink::_MissingSymLink4() {} +void BSymLink::_MissingSymLink5() {} +void BSymLink::_MissingSymLink6() {} //! Returns the BSymLink's file descriptor. /*! To be used instead of accessing the BNode's private \c fFd member directly. diff --git a/src/kits/storage/Volume.cpp b/src/kits/storage/Volume.cpp index fbdcc7ff33..dee8eee0e3 100644 --- a/src/kits/storage/Volume.cpp +++ b/src/kits/storage/Volume.cpp @@ -473,14 +473,14 @@ BVolume::operator=(const BVolume &volume) // FBC -void BVolume::_ReservedVolume1() {} -void BVolume::_ReservedVolume2() {} -void BVolume::_ReservedVolume3() {} -void BVolume::_ReservedVolume4() {} -void BVolume::_ReservedVolume5() {} -void BVolume::_ReservedVolume6() {} -void BVolume::_ReservedVolume7() {} -void BVolume::_ReservedVolume8() {} +void BVolume::_TurnUpTheVolume1() {} +void BVolume::_TurnUpTheVolume2() {} +void BVolume::_TurnUpTheVolume3() {} +void BVolume::_TurnUpTheVolume4() {} +void BVolume::_TurnUpTheVolume5() {} +void BVolume::_TurnUpTheVolume6() {} +void BVolume::_TurnUpTheVolume7() {} +void BVolume::_TurnUpTheVolume8() {} #ifdef USE_OPENBEOS_NAMESPACE } diff --git a/src/kits/storage/VolumeRoster.cpp b/src/kits/storage/VolumeRoster.cpp index 8df1254b8e..170df8f31c 100644 --- a/src/kits/storage/VolumeRoster.cpp +++ b/src/kits/storage/VolumeRoster.cpp @@ -213,8 +213,8 @@ BVolumeRoster::Messenger() const } // FBC -void BVolumeRoster::_ReservedVolumeRoster1() {} -void BVolumeRoster::_ReservedVolumeRoster2() {} +void BVolumeRoster::_SeveredVRoster1() {} +void BVolumeRoster::_SeveredVRoster2() {} #ifdef USE_OPENBEOS_NAMESPACE }