minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-06-28 06:20:21 +02:00
Code Issues Projects Releases Wiki Activity

cleanup: get rid of the legacy #ifndef #define craziness

Browse Source
This commit is contained in:
Loic Blot
2023-06-25 21:15:14 +02:00
committed by sfan5
parent fb7a0e4298
commit e0d4d7d8b4
96 changed files with 106 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/Irrlicht/Android/CAndroidAssetFileArchive.h
View File

@ -2,10 +2,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_ANDROID_ASSET_FILE_ARCHIVE_H_INCLUDED__
#define __C_ANDROID_ASSET_FILE_ARCHIVE_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_ANDROID_ASSET_READER_
@ -47,7 +44,7 @@ namespace io
//! get the archive type
virtual E_FILE_ARCHIVE_TYPE getType() const;
//! Add a directory to read files from. Since the Android
//! Add a directory to read files from. Since the Android
//! API does not return names of directories, they need to
//! be added manually.
virtual void addDirectoryToFileList(const io::path &filename);
@ -65,5 +62,3 @@ namespace io
} // end namespace irr
#endif // _IRR_COMPILE_ANDROID_ASSET_READER_
#endif // __C_ANDROID_ASSET_READER_H_INCLUDED__

7
source/Irrlicht/Android/CAndroidAssetReader.h
View File

@ -2,10 +2,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_ANDROID_ASSET_READER_H_INCLUDED__
#define __C_ANDROID_ASSET_READER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_ANDROID_ASSET_READER_
@ -70,5 +67,3 @@ namespace io
} // end namespace irr
#endif // _IRR_COMPILE_ANDROID_ASSET_READER_
#endif // __C_ANDROID_ASSET_READER_H_INCLUDED__

4
source/Irrlicht/Android/CIrrDeviceAndroid.h
View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IRR_DEVICE_ANDROID_H_INCLUDED__
#define __C_IRR_DEVICE_ANDROID_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
@ -100,4 +99,3 @@ namespace irr
} // end namespace irr
#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_
#endif // __C_IRR_DEVICE_ANDROID_H_INCLUDED__

7
source/Irrlicht/Android/CKeyEventWrapper.h
View File

@ -1,9 +1,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__
#define __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
@ -28,7 +26,7 @@ public:
int getUnicodeChar(int metaState);
private:
static jclass Class_KeyEvent;
static jclass Class_KeyEvent;
static jmethodID Method_getUnicodeChar;
static jmethodID Method_constructor;
JNIEnv* JniEnv;
@ -39,4 +37,3 @@ private:
} // namespace irr
#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_
#endif // __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__