Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10992


Ignore:
Timestamp:
Dec 29, 2015, 5:16:28 PM (9 years ago)
Author:
landauf
Message:

for all non-copyable classes (i.e. those with deleted copy-constructor) I added also a deleted assignment operator

Location:
code/branches/cpp11_v2/src
Files:
35 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h

    r10990 r10992  
    104104
    105105        private:
     106            // non-copyable:
    106107            ApplicationPaths(const ApplicationPaths&) = delete;
     108            ApplicationPaths& operator=(const ApplicationPaths&) = delete;
    107109
    108110            std::vector<std::string> getModuleOrPluginPaths(boost::filesystem::path& directory, const std::string& extension);

  • code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h

    r10990 r10992  
    9393
    9494        private:
     95            // non-copyable:
    9596            ConfigurablePaths(const ConfigurablePaths&) = delete;
     97            ConfigurablePaths& operator=(const ConfigurablePaths&) = delete;
    9698
    9799            boost::filesystem::path& dataPath_;              //!< Path to the data files folder

  • code/branches/cpp11_v2/src/libraries/core/Core.h

    r10990 r10992  
    9292
    9393        private:
     94            // non-copyable:
    9495            Core(const Core&) = delete;
     96            Core& operator=(const Core&) = delete;
    9597
    9698            void setThreadAffinity(int limitToCPU);

  • code/branches/cpp11_v2/src/libraries/core/GUIManager.h

    r10990 r10992  
    151151
    152152    private:
     153        // non-copyable:
    153154        GUIManager(const GUIManager&) = delete;
     155        GUIManager& operator=(const GUIManager&) = delete;
    154156
    155157        void executeCode(const std::string& str);

  • code/branches/cpp11_v2/src/libraries/core/Game.h

    r10990 r10992  
    145145        };
    146146
     147        // non-copyable:
    147148        Game(const Game&) = delete;
     149        Game& operator=(const Game&) = delete;
    148150
    149151        void loadGraphics();

  • code/branches/cpp11_v2/src/libraries/core/GameMode.h

    r10990 r10992  
    6666            GameMode() = delete;
    6767            GameMode(const GameMode&) = delete;
     68            GameMode& operator=(const GameMode&) = delete;
    6869            ~GameMode() = delete;
    6970

  • code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h

    r10990 r10992  
    102102
    103103    private:
     104        // non-copyable:
    104105        GraphicsManager(const GraphicsManager&) = delete;
     106        GraphicsManager& operator=(const GraphicsManager&) = delete;
    105107
    106108        // OGRE initialisation

  • code/branches/cpp11_v2/src/libraries/core/Language.h

    r10990 r10992  
    171171
    172172        private:
     173            // non-copyable:
    173174            Language(const Language&) = delete;
     175            Language& operator=(const Language&) = delete;
    174176
    175177            void readDefaultLanguageFile();

  • code/branches/cpp11_v2/src/libraries/core/Resource.h

    r10990 r10992  
    144144        Resource() = delete;
    145145        Resource(const Resource&) = delete;
     146        Resource& operator=(const Resource&) = delete;
    146147        ~Resource() = delete;
    147148    };

  • code/branches/cpp11_v2/src/libraries/core/class/Identifier.h

    r10990 r10992  
    118118        public:
    119119            Identifier(const std::string& name, Factory* factory, bool bLoadable);
     120            virtual ~Identifier();
     121
     122            // non-copyable:
    120123            Identifier(const Identifier&) = delete;
    121             virtual ~Identifier();
     124            Identifier& operator=(const Identifier&) = delete;
    122125
    123126            /// Returns the name of the class the Identifier belongs to.
    … …  
    302305
    303306        private:
     307            // non-copyable:
    304308            ClassIdentifier(const ClassIdentifier<T>&) = delete;
     309            ClassIdentifier& operator=(const ClassIdentifier<T>&) = delete;
    305310
    306311            void setConfigValues(T* object, Configurable*) const;

  • code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h

    r10990 r10992  
    9595
    9696        private:
     97            // non-copyable:
    9798            IdentifierManager(const IdentifierManager&) = delete;
     99            IdentifierManager& operator=(const IdentifierManager&) = delete;
    98100
    99101            /// Increases the hierarchyCreatingCounter_s variable, causing all new objects to store their parents.

  • code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h

    r10990 r10992  
    133133        private:
    134134            CommandExecutor() = default;                      ///< Empty constructor
    135             CommandExecutor(const CommandExecutor&) = delete; ///< Not implemented copy-constructor
    136135            ~CommandExecutor() = default;                     ///< Empty destructor
     136
     137            // non-copyable:
     138            CommandExecutor(const CommandExecutor&) = delete;
     139            CommandExecutor& operator=(const CommandExecutor&) = delete;
    137140
    138141            static CommandExecutor& getInstance();

  • code/branches/cpp11_v2/src/libraries/core/command/IRC.h

    r10990 r10992  
    6565
    6666            IRC();
     67            ~IRC() = default;
     68
     69            // non-copyable:
    6770            IRC(const IRC&) = delete;
    68             ~IRC() = default;
     71            IRC& operator=(const IRC&) = delete;
    6972
    7073            Tcl::interpreter* interpreter_;     ///< The Tcl interpreter that is used for the IRC connection

  • code/branches/cpp11_v2/src/libraries/core/command/Shell.h

    r10990 r10992  
    149149
    150150        private:
     151            // non-copyable:
    151152            Shell(const Shell&) = delete;
     153            Shell& operator=(const Shell&) = delete;
    152154
    153155            // DevModeListener

  • code/branches/cpp11_v2/src/libraries/core/command/TclBind.h

    r10990 r10992  
    124124
    125125        private:
     126            // non-copyable:
    126127            TclBind(const TclBind&) = delete;
     128            TclBind& operator=(const TclBind&) = delete;
    127129
    128130            static std::string tcl_helper(Tcl::object const &args, bool bQuery);

  • code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h

    r10990 r10992  
    107107
    108108    private:
     109        // non-copyable:
    109110        CommandLineArgument(const CommandLineArgument&) = delete;
     111        CommandLineArgument& operator=(const CommandLineArgument&) = delete;
    110112
    111113        //! Parses the value string of a command line argument.

  • code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h

    r10990 r10992  
    6767
    6868        private:
     69            // non-copyable:
    6970            ConfigFileManager(const ConfigFileManager&) = delete;
     71            ConfigFileManager& operator=(const ConfigFileManager&) = delete;
    7072
    7173            std::array<ConfigFile*, 3> configFiles_;        ///< Stores the config files for each type in an array (must have the same size like ConfigFileType::Value)

  • code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h

    r10990 r10992  
    9999
    100100    private:
     101        // non-copyable:
    101102        InputDevice(const InputDevice&) = delete;
     103        InputDevice& operator=(const InputDevice&) = delete;
    102104
    103105        bool bCalibrating_;                  //!< Whether the device is in calibration mode

  • code/branches/cpp11_v2/src/libraries/core/input/InputManager.h

    r10990 r10992  
    192192
    193193    private: // functions
     194        // non-copyable:
    194195        InputManager(const InputManager&) = delete;
     196        InputManager& operator=(const InputManager&) = delete;
    195197
    196198        // Internal methods

  • code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h

    r10990 r10992  
    102102
    103103    private:
     104        // non-copyable:
    104105        KeyBinderManager(const KeyBinderManager&) = delete;
     106        KeyBinderManager& operator=(const KeyBinderManager&) = delete;
     107
    105108        void keybindInternal(const std::string& command, bool bTemporary);
    106109        void keybindKeyPressed(const std::string& keyName);

  • code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h

    r10990 r10992  
    4848
    4949    private:
     50        // non-copyable:
    5051        KeyDetector(const KeyDetector&) = delete;
     52        KeyDetector& operator=(const KeyDetector&) = delete;
    5153
    5254        void callback(const std::string& name);

  • code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h

    r10990 r10992  
    5454
    5555    private:
     56        // non-copyable:
    5657        ResourceCollection(const ResourceCollection&) = delete;
     58        ResourceCollection& operator=(const ResourceCollection&) = delete;
    5759
    5860        std::string resourceGroup_;

  • code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h

    r10990 r10992  
    6060
    6161    private:
     62        // non-copyable:
    6263        ResourceLocation(const ResourceLocation&) = delete;
     64        ResourceLocation& operator=(const ResourceLocation&) = delete;
    6365
    6466        void load(const std::string& resourceGroup);

  • code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h

    r10990 r10992  
    5252        TextureGenerator() = delete;
    5353        TextureGenerator(const TextureGenerator&) = delete;
     54        TextureGenerator& operator=(const TextureGenerator&) = delete;
    5455        ~TextureGenerator() = delete;
    5556

  • code/branches/cpp11_v2/src/libraries/util/Clock.h

    r10990 r10992  
    102102
    103103    private:
     104        // non-copyable:
    104105        Clock(const Clock&) = delete;
     106        Clock& operator=(const Clock&) = delete;
    105107
    106108        Ogre::Timer*       timer_;       ///< Ogre timer object

  • code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h

    r10990 r10992  
    8787
    8888    private:
     89        // non-copyable:
    8990        DestructionHelper(const DestructionHelper&) = delete;
     91        DestructionHelper& operator=(const DestructionHelper&) = delete;
    9092
    9193        T* object_;

  • code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h

    r10990 r10992  
    7171        ImplicitConversion() = delete;
    7272        ImplicitConversion(const ImplicitConversion&) = delete;
     73        ImplicitConversion& operator=(const ImplicitConversion&) = delete;
    7374        ~ImplicitConversion() = delete;
     75
    7476        // Gets chosen only if there is an implicit conversion from FromType to ToType.
    7577        static char test(ToType);

  • code/branches/cpp11_v2/src/libraries/util/Singleton.h

    r10990 r10992  
    144144
    145145    private:
     146        // non-copyable:
    146147        Singleton(const Singleton&) = delete;
     148        Singleton& operator=(const Singleton&) = delete;
    147149    };
    148150}

  • code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h

    r10990 r10992  
    5353        public:
    5454            ConsoleWriter(std::ostream& outputStream);
    55             ConsoleWriter(const ConsoleWriter&) = delete;
    5655            virtual ~ConsoleWriter();
    5756
    … …  
    6665
    6766        private:
     67            // non-copyable:
     68            ConsoleWriter(const ConsoleWriter&) = delete;
     69            ConsoleWriter& operator=(const ConsoleWriter&) = delete;
     70
    6871            std::ostream& outputStream_; ///< The ostream to which the console writer writes its output
    6972            bool bEnabled_;              ///< If false, the instance will not write output to the console.

  • code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h

    r10990 r10992  
    5757        public:
    5858            LogWriter();
    59             LogWriter(const LogWriter&) = delete;
    6059            virtual ~LogWriter();
    6160
    … …  
    7372
    7473        private:
     74            // non-copyable:
     75            LogWriter(const LogWriter&) = delete;
     76            LogWriter& operator=(const LogWriter&) = delete;
     77
    7578            void openFile();
    7679            void closeFile();

  • code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h

    r10990 r10992  
    6868        public:
    6969            MemoryWriter();
    70             MemoryWriter(const MemoryWriter&) = delete;
    7170            virtual ~MemoryWriter();
    7271
    … …  
    7877
    7978        private:
     79            // non-copyable:
     80            MemoryWriter(const MemoryWriter&) = delete;
     81            MemoryWriter& operator=(const MemoryWriter&) = delete;
     82
    8083            std::vector<Message> messages_; ///< Stores all output messages from the creation of this instance until disable() is called.
    8184    };

  • code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h

    r10990 r10992  
    6767        public:
    6868            OutputManager();
    69             OutputManager(const OutputManager&) = delete;
    7069            virtual ~OutputManager();
    7170
    … …  
    115114
    116115        private:
     116            // non-copyable:
     117            OutputManager(const OutputManager&) = delete;
     118            OutputManager& operator=(const OutputManager&) = delete;
     119
    117120            void updateMasks();
    118121            void updateCombinedLevelMask();

  • code/branches/cpp11_v2/src/orxonox/CameraManager.h

    r10990 r10992  
    5959
    6060        private:
     61            // non-copyable:
    6162            CameraManager(const CameraManager&) = delete;
     63            CameraManager& operator=(const CameraManager&) = delete;
    6264
    6365            std::list<Camera*>    cameraList_;

  • code/branches/cpp11_v2/src/orxonox/LevelManager.h

    r10990 r10992  
    109109
    110110        private:
     111            // non-copyable:
    111112            LevelManager(const LevelManager&) = delete;
     113            LevelManager& operator=(const LevelManager&) = delete;
    112114
    113115            void activateNextLevel(); //!< Activate the next level.

  • code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h

    r10990 r10992  
    5353
    5454        protected:
     55            // non-copyable:
    5556            ChatManager(const ChatManager&) = delete;
     57            ChatManager& operator=(const ChatManager&) = delete;
    5658
    5759            virtual void incomingChat(const std::string& message, unsigned int sourceID) override;
Note: See TracChangeset for help on using the changeset viewer.