Skip to content

Commit ebc7ecd

Browse files
committed
Merge branch 'dead_code2' into 'master'
Remove dead code See merge request OpenMW/openmw!4454
2 parents 43f25fe + 2522fe9 commit ebc7ecd

File tree

6 files changed

+0
-18
lines changed

6 files changed

+0
-18
lines changed

apps/openmw/mwgui/windowmanagerimp.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,6 @@ namespace MWGui
317317

318318
const Translation::Storage& getTranslationDataStorage() const override;
319319

320-
void onSoulgemDialogButtonPressed(int button);
321-
322320
bool getCursorVisible() override;
323321

324322
/// Call when mouse cursor or buttons are used.

apps/openmw/mwinput/inputmanagerimp.hpp

-10
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,6 @@ namespace MWInput
104104
bool controlsDisabled() override { return mControlsDisabled; }
105105

106106
private:
107-
void convertMousePosForMyGUI(int& x, int& y);
108-
109-
void handleGuiArrowKey(int action);
110-
111-
void quickKey(int index);
112-
void showQuickKeysMenu();
113-
114-
void loadKeyDefaults(bool force = false);
115-
void loadControllerDefaults(bool force = false);
116-
117107
bool mControlsDisabled;
118108

119109
std::unique_ptr<SDLUtil::InputWrapper> mInputWrapper;

apps/openmw/mwrender/renderingmanager.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ namespace MWRender
280280
void updateTextureFiltering();
281281
void updateAmbient();
282282
void setFogColor(const osg::Vec4f& color);
283-
void updateThirdPersonViewMode();
284283

285284
struct WorldspaceChunkMgr
286285
{

apps/openmw/mwsound/openal_output.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,6 @@ namespace MWSound
298298

299299
std::atomic<bool> mIsFinished;
300300

301-
void updateAll(bool local);
302-
303301
OpenAL_SoundStream(const OpenAL_SoundStream& rhs);
304302
OpenAL_SoundStream& operator=(const OpenAL_SoundStream& rhs);
305303

components/files/configurationmanager.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ namespace Files
4747

4848
const std::filesystem::path& getUserConfigPath() const;
4949
const std::filesystem::path& getUserDataPath() const;
50-
const std::filesystem::path& getLocalDataPath() const;
5150
const std::filesystem::path& getInstallPath() const;
5251
const std::vector<std::filesystem::path>& getActiveConfigPaths() const { return mActiveConfigPaths; }
5352

components/resource/scenemanager.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,6 @@ namespace Resource
275275
SceneManager(const SceneManager&);
276276
void operator=(const SceneManager&);
277277
};
278-
279-
std::string getFileExtension(const std::string& file);
280278
}
281279

282280
#endif

0 commit comments

Comments
 (0)